{"action":"opened","number":2,"pull_request":{"url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls/2","id":199376714,"node_id":"MDExOlB1bGxSZXF1ZXN0MTk5Mzc2NzE0","html_url":"https://github.com/githubschool/conflict-practice-f-larocca/pull/2","diff_url":"https://github.com/githubschool/conflict-practice-f-larocca/pull/2.diff","patch_url":"https://github.com/githubschool/conflict-practice-f-larocca/pull/2.patch","issue_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues/2","number":2,"state":"open","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-07-05T07:09:37Z","updated_at":"2018-07-05T07:09:37Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls/2/commits","review_comments_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls/2/comments","review_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls/comments{/number}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues/2/comments","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/statuses/6b50ac7e98a43288737bfd3503af97315fe4de8e","head":{"label":"githubschool:css-changes","ref":"css-changes","sha":"6b50ac7e98a43288737bfd3503af97315fe4de8e","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":139809183,"node_id":"MDEwOlJlcG9zaXRvcnkxMzk4MDkxODM=","name":"conflict-practice-f-larocca","full_name":"githubschool/conflict-practice-f-larocca","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-f-larocca","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/deployments","created_at":"2018-07-05T07:09:20Z","updated_at":"2018-07-05T07:09:32Z","pushed_at":"2018-07-05T07:09:37Z","git_url":"git://github.com/githubschool/conflict-practice-f-larocca.git","ssh_url":"git@github.com:githubschool/conflict-practice-f-larocca.git","clone_url":"https://github.com/githubschool/conflict-practice-f-larocca.git","svn_url":"https://github.com/githubschool/conflict-practice-f-larocca","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":2,"license":null,"forks":0,"open_issues":2,"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":139809183,"node_id":"MDEwOlJlcG9zaXRvcnkxMzk4MDkxODM=","name":"conflict-practice-f-larocca","full_name":"githubschool/conflict-practice-f-larocca","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-f-larocca","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/deployments","created_at":"2018-07-05T07:09:20Z","updated_at":"2018-07-05T07:09:32Z","pushed_at":"2018-07-05T07:09:37Z","git_url":"git://github.com/githubschool/conflict-practice-f-larocca.git","ssh_url":"git@github.com:githubschool/conflict-practice-f-larocca.git","clone_url":"https://github.com/githubschool/conflict-practice-f-larocca.git","svn_url":"https://github.com/githubschool/conflict-practice-f-larocca","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":2,"license":null,"forks":0,"open_issues":2,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls/2"},"html":{"href":"https://github.com/githubschool/conflict-practice-f-larocca/pull/2"},"issue":{"href":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues/2"},"comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/githubschool/conflict-practice-f-larocca/statuses/6b50ac7e98a43288737bfd3503af97315fe4de8e"}},"author_association":"MEMBER","merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":3,"additions":19,"deletions":10,"changed_files":1}}
{"actor":{"display_login":"githubteacher"}}