{"action":"opened","issue":{"url":"https://api.github.com/repos/danielsna/team-2/issues/4","repository_url":"https://api.github.com/repos/danielsna/team-2","labels_url":"https://api.github.com/repos/danielsna/team-2/issues/4/labels{/name}","comments_url":"https://api.github.com/repos/danielsna/team-2/issues/4/comments","events_url":"https://api.github.com/repos/danielsna/team-2/issues/4/events","html_url":"https://github.com/danielsna/team-2/issues/4","id":187931889,"number":4,"title":"Creating a Merge-Conflict","user":{"login":"AbelThar","id":23165475,"avatar_url":"https://avatars.githubusercontent.com/u/23165475?v=3","gravatar_id":"","url":"https://api.github.com/users/AbelThar","html_url":"https://github.com/AbelThar","followers_url":"https://api.github.com/users/AbelThar/followers","following_url":"https://api.github.com/users/AbelThar/following{/other_user}","gists_url":"https://api.github.com/users/AbelThar/gists{/gist_id}","starred_url":"https://api.github.com/users/AbelThar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AbelThar/subscriptions","organizations_url":"https://api.github.com/users/AbelThar/orgs","repos_url":"https://api.github.com/users/AbelThar/repos","events_url":"https://api.github.com/users/AbelThar/events{/privacy}","received_events_url":"https://api.github.com/users/AbelThar/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2016-11-08T08:40:32Z","updated_at":"2016-11-08T08:40:32Z","closed_at":null,"body":"Yesterday, @danielsna and I, attempted to create the first merge-conflict; if you may have noticed that did not work out as well.\r\n\r\nGit still managed to recognize some similarities between our documents and handled it automatically.\r\n\r\nNow we will try again, this time make sure not to use the following characters, mainly for formatting purposes (If you use them occasionally, or are part of the recipe, then it should not matter):\r\n\r\n- <\r\n- \\>\r\n- ++\r\n- \\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\\-\r\n\r\nIf this does not work, I will try to remove my version, and start off by pushing the recipes first, and I'll perform the edit later on.\r\n\r\nI would have preferred for it to be done like this so as to allow for merge conflicts, but now I am not so sure this will be viable.  "}}
{"actor":{"display_login":"AbelThar"}}