{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls/1","id":197187132,"node_id":"MDExOlB1bGxSZXF1ZXN0MTk3MTg3MTMy","html_url":"https://github.com/githubschool/conflict-practice-chinchot/pull/1","diff_url":"https://github.com/githubschool/conflict-practice-chinchot/pull/1.diff","patch_url":"https://github.com/githubschool/conflict-practice-chinchot/pull/1.patch","issue_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/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-06-25T17:43:42Z","updated_at":"2018-06-26T17:28:12Z","closed_at":"2018-06-26T17:28:12Z","merged_at":"2018-06-26T17:28:12Z","merge_commit_sha":"b3656b2998350af5c23440d7dbf66d97dbf0e49f","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls/1/commits","review_comments_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls/1/comments","review_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls/comments{/number}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues/1/comments","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/statuses/cd65f438b56f8e93fd6f15324ab3386f91615674","head":{"label":"githubschool:manual","ref":"manual","sha":"cd65f438b56f8e93fd6f15324ab3386f91615674","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":138629687,"node_id":"MDEwOlJlcG9zaXRvcnkxMzg2Mjk2ODc=","name":"conflict-practice-chinchot","full_name":"githubschool/conflict-practice-chinchot","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-chinchot","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/deployments","created_at":"2018-06-25T17:43:27Z","updated_at":"2018-06-26T17:06:47Z","pushed_at":"2018-06-26T17:28:12Z","git_url":"git://github.com/githubschool/conflict-practice-chinchot.git","ssh_url":"git@github.com:githubschool/conflict-practice-chinchot.git","clone_url":"https://github.com/githubschool/conflict-practice-chinchot.git","svn_url":"https://github.com/githubschool/conflict-practice-chinchot","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":0,"license":null,"forks":0,"open_issues":0,"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":138629687,"node_id":"MDEwOlJlcG9zaXRvcnkxMzg2Mjk2ODc=","name":"conflict-practice-chinchot","full_name":"githubschool/conflict-practice-chinchot","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-chinchot","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot","forks_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/forks","keys_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/keys{/key_id}","collaborators_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/teams","hooks_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/hooks","issue_events_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues/events{/number}","events_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/events","assignees_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/assignees{/user}","branches_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/branches{/branch}","tags_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/tags","blobs_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/refs{/sha}","trees_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/trees{/sha}","statuses_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/statuses/{sha}","languages_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/languages","stargazers_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/stargazers","contributors_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/contributors","subscribers_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/subscribers","subscription_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/subscription","commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/commits{/sha}","git_commits_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/git/commits{/sha}","comments_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/comments{/number}","issue_comment_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues/comments{/number}","contents_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/contents/{+path}","compare_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/compare/{base}...{head}","merges_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/merges","archive_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/downloads","issues_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues{/number}","pulls_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls{/number}","milestones_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/milestones{/number}","notifications_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/labels{/name}","releases_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/releases{/id}","deployments_url":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/deployments","created_at":"2018-06-25T17:43:27Z","updated_at":"2018-06-26T17:06:47Z","pushed_at":"2018-06-26T17:28:12Z","git_url":"git://github.com/githubschool/conflict-practice-chinchot.git","ssh_url":"git@github.com:githubschool/conflict-practice-chinchot.git","clone_url":"https://github.com/githubschool/conflict-practice-chinchot.git","svn_url":"https://github.com/githubschool/conflict-practice-chinchot","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":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls/1"},"html":{"href":"https://github.com/githubschool/conflict-practice-chinchot/pull/1"},"issue":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues/1"},"comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/githubschool/conflict-practice-chinchot/statuses/cd65f438b56f8e93fd6f15324ab3386f91615674"}},"author_association":"MEMBER","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"chinchot","id":13741373,"node_id":"MDQ6VXNlcjEzNzQxMzcz","avatar_url":"https://avatars0.githubusercontent.com/u/13741373?v=4","gravatar_id":"","url":"https://api.github.com/users/chinchot","html_url":"https://github.com/chinchot","followers_url":"https://api.github.com/users/chinchot/followers","following_url":"https://api.github.com/users/chinchot/following{/other_user}","gists_url":"https://api.github.com/users/chinchot/gists{/gist_id}","starred_url":"https://api.github.com/users/chinchot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chinchot/subscriptions","organizations_url":"https://api.github.com/users/chinchot/orgs","repos_url":"https://api.github.com/users/chinchot/repos","events_url":"https://api.github.com/users/chinchot/events{/privacy}","received_events_url":"https://api.github.com/users/chinchot/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":21,"deletions":17,"changed_files":2}}
{"actor":{"display_login":"chinchot"}}