{"action":"created","issue":{"url":"https://api.github.com/repos/swcarpentry/sql-novice-survey/issues/74","labels_url":"https://api.github.com/repos/swcarpentry/sql-novice-survey/issues/74/labels{/name}","comments_url":"https://api.github.com/repos/swcarpentry/sql-novice-survey/issues/74/comments","events_url":"https://api.github.com/repos/swcarpentry/sql-novice-survey/issues/74/events","html_url":"https://github.com/swcarpentry/sql-novice-survey/issues/74","id":69487511,"number":74,"title":"Errata in Filtering Lesson of Using Databases and SQL","user":{"login":"bmagill1250","id":8136226,"avatar_url":"https://avatars.githubusercontent.com/u/8136226?v=3","gravatar_id":"","url":"https://api.github.com/users/bmagill1250","html_url":"https://github.com/bmagill1250","followers_url":"https://api.github.com/users/bmagill1250/followers","following_url":"https://api.github.com/users/bmagill1250/following{/other_user}","gists_url":"https://api.github.com/users/bmagill1250/gists{/gist_id}","starred_url":"https://api.github.com/users/bmagill1250/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bmagill1250/subscriptions","organizations_url":"https://api.github.com/users/bmagill1250/orgs","repos_url":"https://api.github.com/users/bmagill1250/repos","events_url":"https://api.github.com/users/bmagill1250/events{/privacy}","received_events_url":"https://api.github.com/users/bmagill1250/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-04-20T01:47:19Z","updated_at":"2015-04-20T05:07:32Z","closed_at":null,"body":"In the Filtering lesson of Using Databases and SQL I came across the following in the following:\r\n \r\n<<<<<<< HEAD (The parentheses around the individual tests aren't strictly required, but they help make the query easier to read.)\r\nDate types\r\n======= >>>>>> 06563c2f46681b04db26066a231d9dc237c0ffa0\r\n \r\nIt occurs right after the SQL statement:\r\n \r\nSELECT * FROM Visited WHERE site=\"DR-1\" AND dated<=\"1930-00-00\";\r\n \r\nLooking at the files in the repository, I did not see it in 03-filter.md, but it is in the page 03-filter.html. "},"comment":{"url":"https://api.github.com/repos/swcarpentry/sql-novice-survey/issues/comments/94358052","html_url":"https://github.com/swcarpentry/sql-novice-survey/issues/74#issuecomment-94358052","issue_url":"https://api.github.com/repos/swcarpentry/sql-novice-survey/issues/74","id":94358052,"user":{"login":"wking","id":209920,"avatar_url":"https://avatars.githubusercontent.com/u/209920?v=3","gravatar_id":"","url":"https://api.github.com/users/wking","html_url":"https://github.com/wking","followers_url":"https://api.github.com/users/wking/followers","following_url":"https://api.github.com/users/wking/following{/other_user}","gists_url":"https://api.github.com/users/wking/gists{/gist_id}","starred_url":"https://api.github.com/users/wking/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wking/subscriptions","organizations_url":"https://api.github.com/users/wking/orgs","repos_url":"https://api.github.com/users/wking/repos","events_url":"https://api.github.com/users/wking/events{/privacy}","received_events_url":"https://api.github.com/users/wking/received_events","type":"User","site_admin":false},"created_at":"2015-04-20T05:07:32Z","updated_at":"2015-04-20T05:07:32Z","body":"On Sun, Apr 19, 2015 at 06:47:20PM -0700, bmagill1250 wrote:\n> Looking at the files in the repository, I did not see it in\n> 03-filter.md, but it is in the page 03-filter.html.\n\nThis was just a missed merge conflict that wasn't resolved before\nc0756e2 (fixing merge conflict, 2015-03-26) was committed.  The\nMarkdown source was fixed in a9df6c10 (03-filter.md: Remove\nconflict-markers around the date type callout, 2015-03-28, #53) and\nalso in the parallel 8355713f (Remove git conflict markup and text,\n2015-04-02, #59).  The entry in the HTML should go away once the\nmaintainers rebuilt the repositories HTML to pick up those changes to\nthe Markdown source.\n"}}