{"action":"closed","number":2,"pull_request":{"url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls/2","id":230940824,"node_id":"MDExOlB1bGxSZXF1ZXN0MjMwOTQwODI0","html_url":"https://github.com/githubschool/conflict-practice-actanm/pull/2","diff_url":"https://github.com/githubschool/conflict-practice-actanm/pull/2.diff","patch_url":"https://github.com/githubschool/conflict-practice-actanm/pull/2.patch","issue_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues/2","number":2,"state":"closed","locked":false,"title":"Minor CSS fixes","user":{"login":"githubteacher","id":2132216,"node_id":"MDQ6VXNlcjIxMzIyMTY=","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},"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-11-14T18:43:24Z","updated_at":"2018-11-14T20:02:17Z","closed_at":"2018-11-14T20:02:17Z","merged_at":"2018-11-14T20:02:17Z","merge_commit_sha":"dfe97371e0251e783563808854c23a38bf8453e2","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls/2/commits","review_comments_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls/2/comments","review_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls/comments{/number}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues/2/comments","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/statuses/f199b654b925e8efd77a8a1d9ba5c36638b59d2a","head":{"label":"githubschool:css-changes","ref":"css-changes","sha":"f199b654b925e8efd77a8a1d9ba5c36638b59d2a","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":157594565,"node_id":"MDEwOlJlcG9zaXRvcnkxNTc1OTQ1NjU=","name":"conflict-practice-actanm","full_name":"githubschool/conflict-practice-actanm","private":false,"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},"html_url":"https://github.com/githubschool/conflict-practice-actanm","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-actanm","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/deployments","created_at":"2018-11-14T18:43:08Z","updated_at":"2018-11-14T19:56:43Z","pushed_at":"2018-11-14T20:02:17Z","git_url":"git://github.com/githubschool/conflict-practice-actanm.git","ssh_url":"git@github.com:githubschool/conflict-practice-actanm.git","clone_url":"https://github.com/githubschool/conflict-practice-actanm.git","svn_url":"https://github.com/githubschool/conflict-practice-actanm","homepage":null,"size":435,"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":"fb0765875c1a03977088b6fc27f80a1a0bd16cec","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":157594565,"node_id":"MDEwOlJlcG9zaXRvcnkxNTc1OTQ1NjU=","name":"conflict-practice-actanm","full_name":"githubschool/conflict-practice-actanm","private":false,"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},"html_url":"https://github.com/githubschool/conflict-practice-actanm","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-actanm","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-actanm/deployments","created_at":"2018-11-14T18:43:08Z","updated_at":"2018-11-14T19:56:43Z","pushed_at":"2018-11-14T20:02:17Z","git_url":"git://github.com/githubschool/conflict-practice-actanm.git","ssh_url":"git@github.com:githubschool/conflict-practice-actanm.git","clone_url":"https://github.com/githubschool/conflict-practice-actanm.git","svn_url":"https://github.com/githubschool/conflict-practice-actanm","homepage":null,"size":435,"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-actanm/pulls/2"},"html":{"href":"https://github.com/githubschool/conflict-practice-actanm/pull/2"},"issue":{"href":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues/2"},"comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-actanm/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/githubschool/conflict-practice-actanm/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/githubschool/conflict-practice-actanm/statuses/f199b654b925e8efd77a8a1d9ba5c36638b59d2a"}},"author_association":"MEMBER","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"actanm","id":44871088,"node_id":"MDQ6VXNlcjQ0ODcxMDg4","avatar_url":"https://avatars2.githubusercontent.com/u/44871088?v=4","gravatar_id":"","url":"https://api.github.com/users/actanm","html_url":"https://github.com/actanm","followers_url":"https://api.github.com/users/actanm/followers","following_url":"https://api.github.com/users/actanm/following{/other_user}","gists_url":"https://api.github.com/users/actanm/gists{/gist_id}","starred_url":"https://api.github.com/users/actanm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/actanm/subscriptions","organizations_url":"https://api.github.com/users/actanm/orgs","repos_url":"https://api.github.com/users/actanm/repos","events_url":"https://api.github.com/users/actanm/events{/privacy}","received_events_url":"https://api.github.com/users/actanm/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":11,"deletions":2,"changed_files":1}}
{"actor":{"display_login":"actanm"}}