{"action":"created","issue":{"url":"https://api.github.com/repos/githubschool/conflict-practice-abbaij01/issues/2","repository_url":"https://api.github.com/repos/githubschool/conflict-practice-abbaij01","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-abbaij01/issues/2/labels{/name}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-abbaij01/issues/2/comments","events_url":"https://api.github.com/repos/githubschool/conflict-practice-abbaij01/issues/2/events","html_url":"https://github.com/githubschool/conflict-practice-abbaij01/pull/2","id":302792776,"number":2,"title":"Minor CSS fixes","user":{"login":"githubteacher","id":2132216,"avatar_url":"https://avatars0.githubusercontent.com/u/2132216?v=4","gravatar_id":"","url":"https://api.github.com/users/githubteacher","html_url":"https://github.com/githubteacher","followers_url":"https://api.github.com/users/githubteacher/followers","following_url":"https://api.github.com/users/githubteacher/following{/other_user}","gists_url":"https://api.github.com/users/githubteacher/gists{/gist_id}","starred_url":"https://api.github.com/users/githubteacher/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/githubteacher/subscriptions","organizations_url":"https://api.github.com/users/githubteacher/orgs","repos_url":"https://api.github.com/users/githubteacher/repos","events_url":"https://api.github.com/users/githubteacher/events{/privacy}","received_events_url":"https://api.github.com/users/githubteacher/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-03-06T17:24:15Z","updated_at":"2018-03-06T19:48:22Z","closed_at":null,"author_association":"OWNER","pull_request":{"url":"https://api.github.com/repos/githubschool/conflict-practice-abbaij01/pulls/2","html_url":"https://github.com/githubschool/conflict-practice-abbaij01/pull/2","diff_url":"https://github.com/githubschool/conflict-practice-abbaij01/pull/2.diff","patch_url":"https://github.com/githubschool/conflict-practice-abbaij01/pull/2.patch"},"body":"This pull request makes some small changes to the CSS. Pick the CSS that you think makes the most sense given the history of the file on both branches and resolve the merge conflict.\n\nIf you need any help resolving this conflict, check out this video: https://vimeo.com/225086721/5a00221234"},"comment":{"url":"https://api.github.com/repos/githubschool/conflict-practice-abbaij01/issues/comments/370905150","html_url":"https://github.com/githubschool/conflict-practice-abbaij01/pull/2#issuecomment-370905150","issue_url":"https://api.github.com/repos/githubschool/conflict-practice-abbaij01/issues/2","id":370905150,"user":{"login":"abbaij01","id":35588603,"avatar_url":"https://avatars1.githubusercontent.com/u/35588603?v=4","gravatar_id":"","url":"https://api.github.com/users/abbaij01","html_url":"https://github.com/abbaij01","followers_url":"https://api.github.com/users/abbaij01/followers","following_url":"https://api.github.com/users/abbaij01/following{/other_user}","gists_url":"https://api.github.com/users/abbaij01/gists{/gist_id}","starred_url":"https://api.github.com/users/abbaij01/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/abbaij01/subscriptions","organizations_url":"https://api.github.com/users/abbaij01/orgs","repos_url":"https://api.github.com/users/abbaij01/repos","events_url":"https://api.github.com/users/abbaij01/events{/privacy}","received_events_url":"https://api.github.com/users/abbaij01/received_events","type":"User","site_admin":false},"created_at":"2018-03-06T19:48:22Z","updated_at":"2018-03-06T19:48:22Z","author_association":"COLLABORATOR","body":"-Some one had committed merge conflict markers\r\n- I could choose the code I wanted, and I chose to uncomment out the URL css with the 'a' tags"}}
{"actor":{"display_login":"abbaij01"}}