{"action":"opened","number":12,"pull_request":{"url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls/12","id":48404087,"html_url":"https://github.com/ahmolishimo/3421Assignment2/pull/12","diff_url":"https://github.com/ahmolishimo/3421Assignment2/pull/12.diff","patch_url":"https://github.com/ahmolishimo/3421Assignment2/pull/12.patch","issue_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/issues/12","number":12,"state":"open","locked":false,"title":"fix conflicts","user":{"login":"geyunxiang","id":9161001,"avatar_url":"https://avatars.githubusercontent.com/u/9161001?v=3","gravatar_id":"","url":"https://api.github.com/users/geyunxiang","html_url":"https://github.com/geyunxiang","followers_url":"https://api.github.com/users/geyunxiang/followers","following_url":"https://api.github.com/users/geyunxiang/following{/other_user}","gists_url":"https://api.github.com/users/geyunxiang/gists{/gist_id}","starred_url":"https://api.github.com/users/geyunxiang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geyunxiang/subscriptions","organizations_url":"https://api.github.com/users/geyunxiang/orgs","repos_url":"https://api.github.com/users/geyunxiang/repos","events_url":"https://api.github.com/users/geyunxiang/events{/privacy}","received_events_url":"https://api.github.com/users/geyunxiang/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-10-22T00:08:14Z","updated_at":"2015-10-22T00:08:14Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls/12/commits","review_comments_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls/12/comments","review_comment_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/issues/12/comments","statuses_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/statuses/c56ff7665392f4cef3f0090251c3cf1a0f665618","head":{"label":"geyunxiang:master","ref":"master","sha":"c56ff7665392f4cef3f0090251c3cf1a0f665618","user":{"login":"geyunxiang","id":9161001,"avatar_url":"https://avatars.githubusercontent.com/u/9161001?v=3","gravatar_id":"","url":"https://api.github.com/users/geyunxiang","html_url":"https://github.com/geyunxiang","followers_url":"https://api.github.com/users/geyunxiang/followers","following_url":"https://api.github.com/users/geyunxiang/following{/other_user}","gists_url":"https://api.github.com/users/geyunxiang/gists{/gist_id}","starred_url":"https://api.github.com/users/geyunxiang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geyunxiang/subscriptions","organizations_url":"https://api.github.com/users/geyunxiang/orgs","repos_url":"https://api.github.com/users/geyunxiang/repos","events_url":"https://api.github.com/users/geyunxiang/events{/privacy}","received_events_url":"https://api.github.com/users/geyunxiang/received_events","type":"User","site_admin":false},"repo":{"id":43623488,"name":"3421Assignment2","full_name":"geyunxiang/3421Assignment2","owner":{"login":"geyunxiang","id":9161001,"avatar_url":"https://avatars.githubusercontent.com/u/9161001?v=3","gravatar_id":"","url":"https://api.github.com/users/geyunxiang","html_url":"https://github.com/geyunxiang","followers_url":"https://api.github.com/users/geyunxiang/followers","following_url":"https://api.github.com/users/geyunxiang/following{/other_user}","gists_url":"https://api.github.com/users/geyunxiang/gists{/gist_id}","starred_url":"https://api.github.com/users/geyunxiang/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/geyunxiang/subscriptions","organizations_url":"https://api.github.com/users/geyunxiang/orgs","repos_url":"https://api.github.com/users/geyunxiang/repos","events_url":"https://api.github.com/users/geyunxiang/events{/privacy}","received_events_url":"https://api.github.com/users/geyunxiang/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/geyunxiang/3421Assignment2","description":"","fork":true,"url":"https://api.github.com/repos/geyunxiang/3421Assignment2","forks_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/forks","keys_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/teams","hooks_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/hooks","issue_events_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/issues/events{/number}","events_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/events","assignees_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/assignees{/user}","branches_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/branches{/branch}","tags_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/tags","blobs_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/git/refs{/sha}","trees_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/statuses/{sha}","languages_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/languages","stargazers_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/stargazers","contributors_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/contributors","subscribers_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/subscribers","subscription_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/subscription","commits_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/commits{/sha}","git_commits_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/git/commits{/sha}","comments_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/comments{/number}","issue_comment_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/issues/comments{/number}","contents_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/contents/{+path}","compare_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/merges","archive_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/downloads","issues_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/issues{/number}","pulls_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/pulls{/number}","milestones_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/milestones{/number}","notifications_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/labels{/name}","releases_url":"https://api.github.com/repos/geyunxiang/3421Assignment2/releases{/id}","created_at":"2015-10-04T03:18:08Z","updated_at":"2015-10-04T03:18:09Z","pushed_at":"2015-10-22T00:07:53Z","git_url":"git://github.com/geyunxiang/3421Assignment2.git","ssh_url":"git@github.com:geyunxiang/3421Assignment2.git","clone_url":"https://github.com/geyunxiang/3421Assignment2.git","svn_url":"https://github.com/geyunxiang/3421Assignment2","homepage":null,"size":8868,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"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":0,"default_branch":"master"}},"base":{"label":"ahmolishimo:master","ref":"master","sha":"f8aa8ac059b7b4f426aa0eee9242fd14322ff77e","user":{"login":"ahmolishimo","id":14257558,"avatar_url":"https://avatars.githubusercontent.com/u/14257558?v=3","gravatar_id":"","url":"https://api.github.com/users/ahmolishimo","html_url":"https://github.com/ahmolishimo","followers_url":"https://api.github.com/users/ahmolishimo/followers","following_url":"https://api.github.com/users/ahmolishimo/following{/other_user}","gists_url":"https://api.github.com/users/ahmolishimo/gists{/gist_id}","starred_url":"https://api.github.com/users/ahmolishimo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ahmolishimo/subscriptions","organizations_url":"https://api.github.com/users/ahmolishimo/orgs","repos_url":"https://api.github.com/users/ahmolishimo/repos","events_url":"https://api.github.com/users/ahmolishimo/events{/privacy}","received_events_url":"https://api.github.com/users/ahmolishimo/received_events","type":"User","site_admin":false},"repo":{"id":43047974,"name":"3421Assignment2","full_name":"ahmolishimo/3421Assignment2","owner":{"login":"ahmolishimo","id":14257558,"avatar_url":"https://avatars.githubusercontent.com/u/14257558?v=3","gravatar_id":"","url":"https://api.github.com/users/ahmolishimo","html_url":"https://github.com/ahmolishimo","followers_url":"https://api.github.com/users/ahmolishimo/followers","following_url":"https://api.github.com/users/ahmolishimo/following{/other_user}","gists_url":"https://api.github.com/users/ahmolishimo/gists{/gist_id}","starred_url":"https://api.github.com/users/ahmolishimo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ahmolishimo/subscriptions","organizations_url":"https://api.github.com/users/ahmolishimo/orgs","repos_url":"https://api.github.com/users/ahmolishimo/repos","events_url":"https://api.github.com/users/ahmolishimo/events{/privacy}","received_events_url":"https://api.github.com/users/ahmolishimo/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/ahmolishimo/3421Assignment2","description":"","fork":false,"url":"https://api.github.com/repos/ahmolishimo/3421Assignment2","forks_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/forks","keys_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/teams","hooks_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/hooks","issue_events_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/issues/events{/number}","events_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/events","assignees_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/assignees{/user}","branches_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/branches{/branch}","tags_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/tags","blobs_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/git/refs{/sha}","trees_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/statuses/{sha}","languages_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/languages","stargazers_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/stargazers","contributors_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/contributors","subscribers_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/subscribers","subscription_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/subscription","commits_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/commits{/sha}","git_commits_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/git/commits{/sha}","comments_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/comments{/number}","issue_comment_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/issues/comments{/number}","contents_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/contents/{+path}","compare_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/merges","archive_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/downloads","issues_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/issues{/number}","pulls_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls{/number}","milestones_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/milestones{/number}","notifications_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/labels{/name}","releases_url":"https://api.github.com/repos/ahmolishimo/3421Assignment2/releases{/id}","created_at":"2015-09-24T06:03:53Z","updated_at":"2015-10-21T22:04:49Z","pushed_at":"2015-10-21T23:57:12Z","git_url":"git://github.com/ahmolishimo/3421Assignment2.git","ssh_url":"git@github.com:ahmolishimo/3421Assignment2.git","clone_url":"https://github.com/ahmolishimo/3421Assignment2.git","svn_url":"https://github.com/ahmolishimo/3421Assignment2","homepage":null,"size":8964,"stargazers_count":2,"watchers_count":2,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":1,"forks":1,"open_issues":1,"watchers":2,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls/12"},"html":{"href":"https://github.com/ahmolishimo/3421Assignment2/pull/12"},"issue":{"href":"https://api.github.com/repos/ahmolishimo/3421Assignment2/issues/12"},"comments":{"href":"https://api.github.com/repos/ahmolishimo/3421Assignment2/issues/12/comments"},"review_comments":{"href":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls/12/comments"},"review_comment":{"href":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ahmolishimo/3421Assignment2/pulls/12/commits"},"statuses":{"href":"https://api.github.com/repos/ahmolishimo/3421Assignment2/statuses/c56ff7665392f4cef3f0090251c3cf1a0f665618"}},"merged":false,"mergeable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"commits":5,"additions":245,"deletions":92,"changed_files":4}}