{"action":"closed","number":2,"pull_request":{"url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls/2","id":212728604,"node_id":"MDExOlB1bGxSZXF1ZXN0MjEyNzI4NjA0","html_url":"https://github.com/githubschool/conflict-practice-andrebzk/pull/2","diff_url":"https://github.com/githubschool/conflict-practice-andrebzk/pull/2.diff","patch_url":"https://github.com/githubschool/conflict-practice-andrebzk/pull/2.patch","issue_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues/2","number":2,"state":"closed","locked":false,"title":"Minor CSS fixes","user":{"login":"brianamarie","id":9906718,"node_id":"MDQ6VXNlcjk5MDY3MTg=","avatar_url":"https://avatars1.githubusercontent.com/u/9906718?v=4","gravatar_id":"","url":"https://api.github.com/users/brianamarie","html_url":"https://github.com/brianamarie","followers_url":"https://api.github.com/users/brianamarie/followers","following_url":"https://api.github.com/users/brianamarie/following{/other_user}","gists_url":"https://api.github.com/users/brianamarie/gists{/gist_id}","starred_url":"https://api.github.com/users/brianamarie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/brianamarie/subscriptions","organizations_url":"https://api.github.com/users/brianamarie/orgs","repos_url":"https://api.github.com/users/brianamarie/repos","events_url":"https://api.github.com/users/brianamarie/events{/privacy}","received_events_url":"https://api.github.com/users/brianamarie/received_events","type":"User","site_admin":true},"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","created_at":"2018-09-03T12:06:43Z","updated_at":"2018-09-03T12:40:15Z","closed_at":"2018-09-03T12:40:15Z","merged_at":"2018-09-03T12:40:15Z","merge_commit_sha":"994553752babf1c16803dfc4430f605aa8eb78ca","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls/2/commits","review_comments_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls/2/comments","review_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls/comments{/number}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues/2/comments","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/statuses/3493e28b7a2a8fe41532f32b20a0c6f1ea0c28c8","head":{"label":"githubschool:css-changes","ref":"css-changes","sha":"3493e28b7a2a8fe41532f32b20a0c6f1ea0c28c8","user":{"login":"githubschool","id":2271728,"node_id":"MDEyOk9yZ2FuaXphdGlvbjIyNzE3Mjg=","avatar_url":"https://avatars0.githubusercontent.com/u/2271728?v=4","gravatar_id":"","url":"https://api.github.com/users/githubschool","html_url":"https://github.com/githubschool","followers_url":"https://api.github.com/users/githubschool/followers","following_url":"https://api.github.com/users/githubschool/following{/other_user}","gists_url":"https://api.github.com/users/githubschool/gists{/gist_id}","starred_url":"https://api.github.com/users/githubschool/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/githubschool/subscriptions","organizations_url":"https://api.github.com/users/githubschool/orgs","repos_url":"https://api.github.com/users/githubschool/repos","events_url":"https://api.github.com/users/githubschool/events{/privacy}","received_events_url":"https://api.github.com/users/githubschool/received_events","type":"Organization","site_admin":false},"repo":{"id":147199521,"node_id":"MDEwOlJlcG9zaXRvcnkxNDcxOTk1MjE=","name":"conflict-practice-andrebzk","full_name":"githubschool/conflict-practice-andrebzk","owner":{"login":"githubschool","id":2271728,"node_id":"MDEyOk9yZ2FuaXphdGlvbjIyNzE3Mjg=","avatar_url":"https://avatars0.githubusercontent.com/u/2271728?v=4","gravatar_id":"","url":"https://api.github.com/users/githubschool","html_url":"https://github.com/githubschool","followers_url":"https://api.github.com/users/githubschool/followers","following_url":"https://api.github.com/users/githubschool/following{/other_user}","gists_url":"https://api.github.com/users/githubschool/gists{/gist_id}","starred_url":"https://api.github.com/users/githubschool/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/githubschool/subscriptions","organizations_url":"https://api.github.com/users/githubschool/orgs","repos_url":"https://api.github.com/users/githubschool/repos","events_url":"https://api.github.com/users/githubschool/events{/privacy}","received_events_url":"https://api.github.com/users/githubschool/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/githubschool/conflict-practice-andrebzk","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/deployments","created_at":"2018-09-03T12:06:26Z","updated_at":"2018-09-03T12:27:57Z","pushed_at":"2018-09-03T12:40:15Z","git_url":"git://github.com/githubschool/conflict-practice-andrebzk.git","ssh_url":"git@github.com:githubschool/conflict-practice-andrebzk.git","clone_url":"https://github.com/githubschool/conflict-practice-andrebzk.git","svn_url":"https://github.com/githubschool/conflict-practice-andrebzk","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"githubschool:master","ref":"master","sha":"1095c8c8e4eb14cbcd68e7302818e5c8e1b2c107","user":{"login":"githubschool","id":2271728,"node_id":"MDEyOk9yZ2FuaXphdGlvbjIyNzE3Mjg=","avatar_url":"https://avatars0.githubusercontent.com/u/2271728?v=4","gravatar_id":"","url":"https://api.github.com/users/githubschool","html_url":"https://github.com/githubschool","followers_url":"https://api.github.com/users/githubschool/followers","following_url":"https://api.github.com/users/githubschool/following{/other_user}","gists_url":"https://api.github.com/users/githubschool/gists{/gist_id}","starred_url":"https://api.github.com/users/githubschool/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/githubschool/subscriptions","organizations_url":"https://api.github.com/users/githubschool/orgs","repos_url":"https://api.github.com/users/githubschool/repos","events_url":"https://api.github.com/users/githubschool/events{/privacy}","received_events_url":"https://api.github.com/users/githubschool/received_events","type":"Organization","site_admin":false},"repo":{"id":147199521,"node_id":"MDEwOlJlcG9zaXRvcnkxNDcxOTk1MjE=","name":"conflict-practice-andrebzk","full_name":"githubschool/conflict-practice-andrebzk","owner":{"login":"githubschool","id":2271728,"node_id":"MDEyOk9yZ2FuaXphdGlvbjIyNzE3Mjg=","avatar_url":"https://avatars0.githubusercontent.com/u/2271728?v=4","gravatar_id":"","url":"https://api.github.com/users/githubschool","html_url":"https://github.com/githubschool","followers_url":"https://api.github.com/users/githubschool/followers","following_url":"https://api.github.com/users/githubschool/following{/other_user}","gists_url":"https://api.github.com/users/githubschool/gists{/gist_id}","starred_url":"https://api.github.com/users/githubschool/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/githubschool/subscriptions","organizations_url":"https://api.github.com/users/githubschool/orgs","repos_url":"https://api.github.com/users/githubschool/repos","events_url":"https://api.github.com/users/githubschool/events{/privacy}","received_events_url":"https://api.github.com/users/githubschool/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/githubschool/conflict-practice-andrebzk","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/deployments","created_at":"2018-09-03T12:06:26Z","updated_at":"2018-09-03T12:27:57Z","pushed_at":"2018-09-03T12:40:15Z","git_url":"git://github.com/githubschool/conflict-practice-andrebzk.git","ssh_url":"git@github.com:githubschool/conflict-practice-andrebzk.git","clone_url":"https://github.com/githubschool/conflict-practice-andrebzk.git","svn_url":"https://github.com/githubschool/conflict-practice-andrebzk","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls/2"},"html":{"href":"https://github.com/githubschool/conflict-practice-andrebzk/pull/2"},"issue":{"href":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues/2"},"comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/githubschool/conflict-practice-andrebzk/statuses/3493e28b7a2a8fe41532f32b20a0c6f1ea0c28c8"}},"author_association":"CONTRIBUTOR","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"andrebzk","id":42930292,"node_id":"MDQ6VXNlcjQyOTMwMjky","avatar_url":"https://avatars0.githubusercontent.com/u/42930292?v=4","gravatar_id":"","url":"https://api.github.com/users/andrebzk","html_url":"https://github.com/andrebzk","followers_url":"https://api.github.com/users/andrebzk/followers","following_url":"https://api.github.com/users/andrebzk/following{/other_user}","gists_url":"https://api.github.com/users/andrebzk/gists{/gist_id}","starred_url":"https://api.github.com/users/andrebzk/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/andrebzk/subscriptions","organizations_url":"https://api.github.com/users/andrebzk/orgs","repos_url":"https://api.github.com/users/andrebzk/repos","events_url":"https://api.github.com/users/andrebzk/events{/privacy}","received_events_url":"https://api.github.com/users/andrebzk/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":5,"deletions":6,"changed_files":1}}
{"actor":{"display_login":"andrebzk"}}