{"action":"closed","number":14,"pull_request":{"url":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls/14","id":50639661,"html_url":"https://github.com/sthlmj/id2212hmw1/pull/14","diff_url":"https://github.com/sthlmj/id2212hmw1/pull/14.diff","patch_url":"https://github.com/sthlmj/id2212hmw1/pull/14.patch","issue_url":"https://api.github.com/repos/sthlmj/id2212hmw1/issues/14","number":14,"state":"closed","locked":false,"title":"Merge branch 'master' into joes-awesome-branch","user":{"login":"sthlmj","id":3594809,"avatar_url":"https://avatars.githubusercontent.com/u/3594809?v=3","gravatar_id":"","url":"https://api.github.com/users/sthlmj","html_url":"https://github.com/sthlmj","followers_url":"https://api.github.com/users/sthlmj/followers","following_url":"https://api.github.com/users/sthlmj/following{/other_user}","gists_url":"https://api.github.com/users/sthlmj/gists{/gist_id}","starred_url":"https://api.github.com/users/sthlmj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sthlmj/subscriptions","organizations_url":"https://api.github.com/users/sthlmj/orgs","repos_url":"https://api.github.com/users/sthlmj/repos","events_url":"https://api.github.com/users/sthlmj/events{/privacy}","received_events_url":"https://api.github.com/users/sthlmj/received_events","type":"User","site_admin":false},"body":"# Conflicts:\r\n#\tbuild/classes/hmw1/client/Gui.class\r\n#\tbuild/classes/hmw1/client/HangmanClient.class\r\n#\tbuild/classes/hmw1/server/ClientGameThread.class\r\n#\tbuild/classes/hmw1/server/ClientWaitThread.class\r\n#\tbuild/classes/hmw1/server/HangmanServer.class\r\n#\tnbproject/private/private.properties\r\n#\tnbproject/private/private.xml\r\n#\tsrc/hmw1/client/CommunicationThread.java\r\n#\tsrc/hmw1/client/Gui.java\r\n#\tsrc/hmw1/client/HangmanClient.java\r\n#\tsrc/hmw1/server/ClientGameThread.java\r\n#\tsrc/hmw1/server/ClientWaitThread.java\r\n#\tsrc/hmw1/server/HangmanServer.java","created_at":"2015-11-13T13:17:39Z","updated_at":"2015-11-13T13:17:47Z","closed_at":"2015-11-13T13:17:47Z","merged_at":"2015-11-13T13:17:47Z","merge_commit_sha":"e6336a91fbdfdbd2ba9813cc6481e905e7e10c9d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls/14/commits","review_comments_url":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls/14/comments","review_comment_url":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls/comments{/number}","comments_url":"https://api.github.com/repos/sthlmj/id2212hmw1/issues/14/comments","statuses_url":"https://api.github.com/repos/sthlmj/id2212hmw1/statuses/69609d301fd1224ded6850c1b80f5359051bdead","head":{"label":"sthlmj:joes2","ref":"joes2","sha":"69609d301fd1224ded6850c1b80f5359051bdead","user":{"login":"sthlmj","id":3594809,"avatar_url":"https://avatars.githubusercontent.com/u/3594809?v=3","gravatar_id":"","url":"https://api.github.com/users/sthlmj","html_url":"https://github.com/sthlmj","followers_url":"https://api.github.com/users/sthlmj/followers","following_url":"https://api.github.com/users/sthlmj/following{/other_user}","gists_url":"https://api.github.com/users/sthlmj/gists{/gist_id}","starred_url":"https://api.github.com/users/sthlmj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sthlmj/subscriptions","organizations_url":"https://api.github.com/users/sthlmj/orgs","repos_url":"https://api.github.com/users/sthlmj/repos","events_url":"https://api.github.com/users/sthlmj/events{/privacy}","received_events_url":"https://api.github.com/users/sthlmj/received_events","type":"User","site_admin":false},"repo":{"id":45870988,"name":"id2212hmw1","full_name":"sthlmj/id2212hmw1","owner":{"login":"sthlmj","id":3594809,"avatar_url":"https://avatars.githubusercontent.com/u/3594809?v=3","gravatar_id":"","url":"https://api.github.com/users/sthlmj","html_url":"https://github.com/sthlmj","followers_url":"https://api.github.com/users/sthlmj/followers","following_url":"https://api.github.com/users/sthlmj/following{/other_user}","gists_url":"https://api.github.com/users/sthlmj/gists{/gist_id}","starred_url":"https://api.github.com/users/sthlmj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sthlmj/subscriptions","organizations_url":"https://api.github.com/users/sthlmj/orgs","repos_url":"https://api.github.com/users/sthlmj/repos","events_url":"https://api.github.com/users/sthlmj/events{/privacy}","received_events_url":"https://api.github.com/users/sthlmj/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/sthlmj/id2212hmw1","description":null,"fork":false,"url":"https://api.github.com/repos/sthlmj/id2212hmw1","forks_url":"https://api.github.com/repos/sthlmj/id2212hmw1/forks","keys_url":"https://api.github.com/repos/sthlmj/id2212hmw1/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sthlmj/id2212hmw1/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sthlmj/id2212hmw1/teams","hooks_url":"https://api.github.com/repos/sthlmj/id2212hmw1/hooks","issue_events_url":"https://api.github.com/repos/sthlmj/id2212hmw1/issues/events{/number}","events_url":"https://api.github.com/repos/sthlmj/id2212hmw1/events","assignees_url":"https://api.github.com/repos/sthlmj/id2212hmw1/assignees{/user}","branches_url":"https://api.github.com/repos/sthlmj/id2212hmw1/branches{/branch}","tags_url":"https://api.github.com/repos/sthlmj/id2212hmw1/tags","blobs_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/refs{/sha}","trees_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sthlmj/id2212hmw1/statuses/{sha}","languages_url":"https://api.github.com/repos/sthlmj/id2212hmw1/languages","stargazers_url":"https://api.github.com/repos/sthlmj/id2212hmw1/stargazers","contributors_url":"https://api.github.com/repos/sthlmj/id2212hmw1/contributors","subscribers_url":"https://api.github.com/repos/sthlmj/id2212hmw1/subscribers","subscription_url":"https://api.github.com/repos/sthlmj/id2212hmw1/subscription","commits_url":"https://api.github.com/repos/sthlmj/id2212hmw1/commits{/sha}","git_commits_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/commits{/sha}","comments_url":"https://api.github.com/repos/sthlmj/id2212hmw1/comments{/number}","issue_comment_url":"https://api.github.com/repos/sthlmj/id2212hmw1/issues/comments{/number}","contents_url":"https://api.github.com/repos/sthlmj/id2212hmw1/contents/{+path}","compare_url":"https://api.github.com/repos/sthlmj/id2212hmw1/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sthlmj/id2212hmw1/merges","archive_url":"https://api.github.com/repos/sthlmj/id2212hmw1/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sthlmj/id2212hmw1/downloads","issues_url":"https://api.github.com/repos/sthlmj/id2212hmw1/issues{/number}","pulls_url":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls{/number}","milestones_url":"https://api.github.com/repos/sthlmj/id2212hmw1/milestones{/number}","notifications_url":"https://api.github.com/repos/sthlmj/id2212hmw1/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sthlmj/id2212hmw1/labels{/name}","releases_url":"https://api.github.com/repos/sthlmj/id2212hmw1/releases{/id}","created_at":"2015-11-09T22:27:37Z","updated_at":"2015-11-09T23:24:42Z","pushed_at":"2015-11-13T13:17:47Z","git_url":"git://github.com/sthlmj/id2212hmw1.git","ssh_url":"git@github.com:sthlmj/id2212hmw1.git","clone_url":"https://github.com/sthlmj/id2212hmw1.git","svn_url":"https://github.com/sthlmj/id2212hmw1","homepage":null,"size":0,"stargazers_count":1,"watchers_count":1,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":1,"default_branch":"master"}},"base":{"label":"sthlmj:master","ref":"master","sha":"82d9744c696e3380dbc20f799a07ffb707492772","user":{"login":"sthlmj","id":3594809,"avatar_url":"https://avatars.githubusercontent.com/u/3594809?v=3","gravatar_id":"","url":"https://api.github.com/users/sthlmj","html_url":"https://github.com/sthlmj","followers_url":"https://api.github.com/users/sthlmj/followers","following_url":"https://api.github.com/users/sthlmj/following{/other_user}","gists_url":"https://api.github.com/users/sthlmj/gists{/gist_id}","starred_url":"https://api.github.com/users/sthlmj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sthlmj/subscriptions","organizations_url":"https://api.github.com/users/sthlmj/orgs","repos_url":"https://api.github.com/users/sthlmj/repos","events_url":"https://api.github.com/users/sthlmj/events{/privacy}","received_events_url":"https://api.github.com/users/sthlmj/received_events","type":"User","site_admin":false},"repo":{"id":45870988,"name":"id2212hmw1","full_name":"sthlmj/id2212hmw1","owner":{"login":"sthlmj","id":3594809,"avatar_url":"https://avatars.githubusercontent.com/u/3594809?v=3","gravatar_id":"","url":"https://api.github.com/users/sthlmj","html_url":"https://github.com/sthlmj","followers_url":"https://api.github.com/users/sthlmj/followers","following_url":"https://api.github.com/users/sthlmj/following{/other_user}","gists_url":"https://api.github.com/users/sthlmj/gists{/gist_id}","starred_url":"https://api.github.com/users/sthlmj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sthlmj/subscriptions","organizations_url":"https://api.github.com/users/sthlmj/orgs","repos_url":"https://api.github.com/users/sthlmj/repos","events_url":"https://api.github.com/users/sthlmj/events{/privacy}","received_events_url":"https://api.github.com/users/sthlmj/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/sthlmj/id2212hmw1","description":null,"fork":false,"url":"https://api.github.com/repos/sthlmj/id2212hmw1","forks_url":"https://api.github.com/repos/sthlmj/id2212hmw1/forks","keys_url":"https://api.github.com/repos/sthlmj/id2212hmw1/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sthlmj/id2212hmw1/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sthlmj/id2212hmw1/teams","hooks_url":"https://api.github.com/repos/sthlmj/id2212hmw1/hooks","issue_events_url":"https://api.github.com/repos/sthlmj/id2212hmw1/issues/events{/number}","events_url":"https://api.github.com/repos/sthlmj/id2212hmw1/events","assignees_url":"https://api.github.com/repos/sthlmj/id2212hmw1/assignees{/user}","branches_url":"https://api.github.com/repos/sthlmj/id2212hmw1/branches{/branch}","tags_url":"https://api.github.com/repos/sthlmj/id2212hmw1/tags","blobs_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/refs{/sha}","trees_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sthlmj/id2212hmw1/statuses/{sha}","languages_url":"https://api.github.com/repos/sthlmj/id2212hmw1/languages","stargazers_url":"https://api.github.com/repos/sthlmj/id2212hmw1/stargazers","contributors_url":"https://api.github.com/repos/sthlmj/id2212hmw1/contributors","subscribers_url":"https://api.github.com/repos/sthlmj/id2212hmw1/subscribers","subscription_url":"https://api.github.com/repos/sthlmj/id2212hmw1/subscription","commits_url":"https://api.github.com/repos/sthlmj/id2212hmw1/commits{/sha}","git_commits_url":"https://api.github.com/repos/sthlmj/id2212hmw1/git/commits{/sha}","comments_url":"https://api.github.com/repos/sthlmj/id2212hmw1/comments{/number}","issue_comment_url":"https://api.github.com/repos/sthlmj/id2212hmw1/issues/comments{/number}","contents_url":"https://api.github.com/repos/sthlmj/id2212hmw1/contents/{+path}","compare_url":"https://api.github.com/repos/sthlmj/id2212hmw1/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sthlmj/id2212hmw1/merges","archive_url":"https://api.github.com/repos/sthlmj/id2212hmw1/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sthlmj/id2212hmw1/downloads","issues_url":"https://api.github.com/repos/sthlmj/id2212hmw1/issues{/number}","pulls_url":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls{/number}","milestones_url":"https://api.github.com/repos/sthlmj/id2212hmw1/milestones{/number}","notifications_url":"https://api.github.com/repos/sthlmj/id2212hmw1/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sthlmj/id2212hmw1/labels{/name}","releases_url":"https://api.github.com/repos/sthlmj/id2212hmw1/releases{/id}","created_at":"2015-11-09T22:27:37Z","updated_at":"2015-11-09T23:24:42Z","pushed_at":"2015-11-13T13:17:47Z","git_url":"git://github.com/sthlmj/id2212hmw1.git","ssh_url":"git@github.com:sthlmj/id2212hmw1.git","clone_url":"https://github.com/sthlmj/id2212hmw1.git","svn_url":"https://github.com/sthlmj/id2212hmw1","homepage":null,"size":0,"stargazers_count":1,"watchers_count":1,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls/14"},"html":{"href":"https://github.com/sthlmj/id2212hmw1/pull/14"},"issue":{"href":"https://api.github.com/repos/sthlmj/id2212hmw1/issues/14"},"comments":{"href":"https://api.github.com/repos/sthlmj/id2212hmw1/issues/14/comments"},"review_comments":{"href":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls/14/comments"},"review_comment":{"href":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/sthlmj/id2212hmw1/pulls/14/commits"},"statuses":{"href":"https://api.github.com/repos/sthlmj/id2212hmw1/statuses/69609d301fd1224ded6850c1b80f5359051bdead"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"sthlmj","id":3594809,"avatar_url":"https://avatars.githubusercontent.com/u/3594809?v=3","gravatar_id":"","url":"https://api.github.com/users/sthlmj","html_url":"https://github.com/sthlmj","followers_url":"https://api.github.com/users/sthlmj/followers","following_url":"https://api.github.com/users/sthlmj/following{/other_user}","gists_url":"https://api.github.com/users/sthlmj/gists{/gist_id}","starred_url":"https://api.github.com/users/sthlmj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sthlmj/subscriptions","organizations_url":"https://api.github.com/users/sthlmj/orgs","repos_url":"https://api.github.com/users/sthlmj/repos","events_url":"https://api.github.com/users/sthlmj/events{/privacy}","received_events_url":"https://api.github.com/users/sthlmj/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":1,"additions":47,"deletions":37,"changed_files":8}}