{"action":"created","issue":{"url":"https://api.github.com/repos/nick-and-jack/precalc1-MHCC/issues/29","repository_url":"https://api.github.com/repos/nick-and-jack/precalc1-MHCC","labels_url":"https://api.github.com/repos/nick-and-jack/precalc1-MHCC/issues/29/labels{/name}","comments_url":"https://api.github.com/repos/nick-and-jack/precalc1-MHCC/issues/29/comments","events_url":"https://api.github.com/repos/nick-and-jack/precalc1-MHCC/issues/29/events","html_url":"https://github.com/nick-and-jack/precalc1-MHCC/pull/29","id":181236917,"number":29,"title":"Created new Geogebra and Activity files","user":{"login":"nick-chura","id":17387548,"avatar_url":"https://avatars.githubusercontent.com/u/17387548?v=3","gravatar_id":"","url":"https://api.github.com/users/nick-chura","html_url":"https://github.com/nick-chura","followers_url":"https://api.github.com/users/nick-chura/followers","following_url":"https://api.github.com/users/nick-chura/following{/other_user}","gists_url":"https://api.github.com/users/nick-chura/gists{/gist_id}","starred_url":"https://api.github.com/users/nick-chura/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nick-chura/subscriptions","organizations_url":"https://api.github.com/users/nick-chura/orgs","repos_url":"https://api.github.com/users/nick-chura/repos","events_url":"https://api.github.com/users/nick-chura/events{/privacy}","received_events_url":"https://api.github.com/users/nick-chura/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2016-10-05T18:55:40Z","updated_at":"2016-10-05T19:42:04Z","closed_at":"2016-10-05T19:37:43Z","pull_request":{"url":"https://api.github.com/repos/nick-and-jack/precalc1-MHCC/pulls/29","html_url":"https://github.com/nick-and-jack/precalc1-MHCC/pull/29","diff_url":"https://github.com/nick-and-jack/precalc1-MHCC/pull/29.diff","patch_url":"https://github.com/nick-and-jack/precalc1-MHCC/pull/29.patch"},"body":"I'm getting a \"Can't automatically merge\" message because somehow, while viewing some files, I inadvertently inserted a space at the end of a few lines."},"comment":{"url":"https://api.github.com/repos/nick-and-jack/precalc1-MHCC/issues/comments/251777723","html_url":"https://github.com/nick-and-jack/precalc1-MHCC/pull/29#issuecomment-251777723","issue_url":"https://api.github.com/repos/nick-and-jack/precalc1-MHCC/issues/29","id":251777723,"user":{"login":"Alex-Jordan","id":4732672,"avatar_url":"https://avatars.githubusercontent.com/u/4732672?v=3","gravatar_id":"","url":"https://api.github.com/users/Alex-Jordan","html_url":"https://github.com/Alex-Jordan","followers_url":"https://api.github.com/users/Alex-Jordan/followers","following_url":"https://api.github.com/users/Alex-Jordan/following{/other_user}","gists_url":"https://api.github.com/users/Alex-Jordan/gists{/gist_id}","starred_url":"https://api.github.com/users/Alex-Jordan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Alex-Jordan/subscriptions","organizations_url":"https://api.github.com/users/Alex-Jordan/orgs","repos_url":"https://api.github.com/users/Alex-Jordan/repos","events_url":"https://api.github.com/users/Alex-Jordan/events{/privacy}","received_events_url":"https://api.github.com/users/Alex-Jordan/received_events","type":"User","site_admin":false},"created_at":"2016-10-05T19:42:04Z","updated_at":"2016-10-05T19:42:04Z","body":"It wasn't about spaces. One file had `</paragraphs>` and `<paragraphs>` inserted at a few places that conflicted with how the HEAD had nothing there.  I addressed the conflict on my local machine and pushed, so your content is there now in master on GitHub. As always, everyone should fetch and pull to get these updates locally. Nick, in your case you might want to trash the branch that was used to create this content and then create a new develop branch for future work:\r\n\r\n```\r\ngit checkout master\r\ngit branch -D develop\r\ngit fetch origin\r\ngit pull origin master\r\ngit checkout -b develop\r\n```\r\n\r\n"}}
{"actor":{"display_login":"Alex-Jordan"}}