{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls/1","id":206718194,"node_id":"MDExOlB1bGxSZXF1ZXN0MjA2NzE4MTk0","html_url":"https://github.com/githubschool/conflict-practice-chrisjobson/pull/1","diff_url":"https://github.com/githubschool/conflict-practice-chrisjobson/pull/1.diff","patch_url":"https://github.com/githubschool/conflict-practice-chrisjobson/pull/1.patch","issue_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues/1","number":1,"state":"closed","locked":false,"title":"Updates to game manual","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 edits the wording of some of the language on the main page. It appears that it has also been edited on master, because there's a merge conflict. Please make sure that all of the words are the ones that you'd like to use, and that there aren't any lines of text missing.\n\nIf you need any help resolving this conflict, check out this video: https://vimeo.com/225093022/6c1c6eb72b","created_at":"2018-08-07T14:29:42Z","updated_at":"2018-08-08T18:32:31Z","closed_at":"2018-08-08T18:32:31Z","merged_at":"2018-08-08T18:32:31Z","merge_commit_sha":"ed90df370fd93292af9ec279cda9bec0c5cf65d7","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls/1/commits","review_comments_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls/1/comments","review_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls/comments{/number}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues/1/comments","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/statuses/e6a0bc0dbf70127a65a725dc81bb78aa9122fc05","head":{"label":"githubschool:manual","ref":"manual","sha":"e6a0bc0dbf70127a65a725dc81bb78aa9122fc05","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":143885175,"node_id":"MDEwOlJlcG9zaXRvcnkxNDM4ODUxNzU=","name":"conflict-practice-chrisjobson","full_name":"githubschool/conflict-practice-chrisjobson","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-chrisjobson","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/deployments","created_at":"2018-08-07T14:29:26Z","updated_at":"2018-08-08T18:06:45Z","pushed_at":"2018-08-08T18:32:31Z","git_url":"git://github.com/githubschool/conflict-practice-chrisjobson.git","ssh_url":"git@github.com:githubschool/conflict-practice-chrisjobson.git","clone_url":"https://github.com/githubschool/conflict-practice-chrisjobson.git","svn_url":"https://github.com/githubschool/conflict-practice-chrisjobson","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":"b8b5655a5ff17c464e22d134969632f1eb97d086","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":143885175,"node_id":"MDEwOlJlcG9zaXRvcnkxNDM4ODUxNzU=","name":"conflict-practice-chrisjobson","full_name":"githubschool/conflict-practice-chrisjobson","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-chrisjobson","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/deployments","created_at":"2018-08-07T14:29:26Z","updated_at":"2018-08-08T18:06:45Z","pushed_at":"2018-08-08T18:32:31Z","git_url":"git://github.com/githubschool/conflict-practice-chrisjobson.git","ssh_url":"git@github.com:githubschool/conflict-practice-chrisjobson.git","clone_url":"https://github.com/githubschool/conflict-practice-chrisjobson.git","svn_url":"https://github.com/githubschool/conflict-practice-chrisjobson","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-chrisjobson/pulls/1"},"html":{"href":"https://github.com/githubschool/conflict-practice-chrisjobson/pull/1"},"issue":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues/1"},"comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chrisjobson/statuses/e6a0bc0dbf70127a65a725dc81bb78aa9122fc05"}},"author_association":"MEMBER","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"chrisjobson","id":31853910,"node_id":"MDQ6VXNlcjMxODUzOTEw","avatar_url":"https://avatars2.githubusercontent.com/u/31853910?v=4","gravatar_id":"","url":"https://api.github.com/users/chrisjobson","html_url":"https://github.com/chrisjobson","followers_url":"https://api.github.com/users/chrisjobson/followers","following_url":"https://api.github.com/users/chrisjobson/following{/other_user}","gists_url":"https://api.github.com/users/chrisjobson/gists{/gist_id}","starred_url":"https://api.github.com/users/chrisjobson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chrisjobson/subscriptions","organizations_url":"https://api.github.com/users/chrisjobson/orgs","repos_url":"https://api.github.com/users/chrisjobson/repos","events_url":"https://api.github.com/users/chrisjobson/events{/privacy}","received_events_url":"https://api.github.com/users/chrisjobson/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":17,"deletions":17,"changed_files":1}}
{"actor":{"display_login":"chrisjobson"}}