{"action":"closed","number":21,"pull_request":{"url":"https://api.github.com/repos/zZissou/CodeCoach/pulls/21","id":94720319,"html_url":"https://github.com/zZissou/CodeCoach/pull/21","diff_url":"https://github.com/zZissou/CodeCoach/pull/21.diff","patch_url":"https://github.com/zZissou/CodeCoach/pull/21.patch","issue_url":"https://api.github.com/repos/zZissou/CodeCoach/issues/21","number":21,"state":"closed","locked":false,"title":"fixing merge conflict","user":{"login":"cittaliu","id":22066198,"avatar_url":"https://avatars.githubusercontent.com/u/22066198?v=3","gravatar_id":"","url":"https://api.github.com/users/cittaliu","html_url":"https://github.com/cittaliu","followers_url":"https://api.github.com/users/cittaliu/followers","following_url":"https://api.github.com/users/cittaliu/following{/other_user}","gists_url":"https://api.github.com/users/cittaliu/gists{/gist_id}","starred_url":"https://api.github.com/users/cittaliu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cittaliu/subscriptions","organizations_url":"https://api.github.com/users/cittaliu/orgs","repos_url":"https://api.github.com/users/cittaliu/repos","events_url":"https://api.github.com/users/cittaliu/events{/privacy}","received_events_url":"https://api.github.com/users/cittaliu/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-11-21T23:40:35Z","updated_at":"2016-11-21T23:40:39Z","closed_at":"2016-11-21T23:40:39Z","merged_at":"2016-11-21T23:40:39Z","merge_commit_sha":"5ecb2f7b667310cac11aa9cad0a62c369c27a889","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/zZissou/CodeCoach/pulls/21/commits","review_comments_url":"https://api.github.com/repos/zZissou/CodeCoach/pulls/21/comments","review_comment_url":"https://api.github.com/repos/zZissou/CodeCoach/pulls/comments{/number}","comments_url":"https://api.github.com/repos/zZissou/CodeCoach/issues/21/comments","statuses_url":"https://api.github.com/repos/zZissou/CodeCoach/statuses/c56e1084218bb0e79216d09f274d784e29acbd72","head":{"label":"zZissou:diane-dev","ref":"diane-dev","sha":"c56e1084218bb0e79216d09f274d784e29acbd72","user":{"login":"zZissou","id":20157292,"avatar_url":"https://avatars.githubusercontent.com/u/20157292?v=3","gravatar_id":"","url":"https://api.github.com/users/zZissou","html_url":"https://github.com/zZissou","followers_url":"https://api.github.com/users/zZissou/followers","following_url":"https://api.github.com/users/zZissou/following{/other_user}","gists_url":"https://api.github.com/users/zZissou/gists{/gist_id}","starred_url":"https://api.github.com/users/zZissou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zZissou/subscriptions","organizations_url":"https://api.github.com/users/zZissou/orgs","repos_url":"https://api.github.com/users/zZissou/repos","events_url":"https://api.github.com/users/zZissou/events{/privacy}","received_events_url":"https://api.github.com/users/zZissou/received_events","type":"User","site_admin":false},"repo":{"id":73955770,"name":"CodeCoach","full_name":"zZissou/CodeCoach","owner":{"login":"zZissou","id":20157292,"avatar_url":"https://avatars.githubusercontent.com/u/20157292?v=3","gravatar_id":"","url":"https://api.github.com/users/zZissou","html_url":"https://github.com/zZissou","followers_url":"https://api.github.com/users/zZissou/followers","following_url":"https://api.github.com/users/zZissou/following{/other_user}","gists_url":"https://api.github.com/users/zZissou/gists{/gist_id}","starred_url":"https://api.github.com/users/zZissou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zZissou/subscriptions","organizations_url":"https://api.github.com/users/zZissou/orgs","repos_url":"https://api.github.com/users/zZissou/repos","events_url":"https://api.github.com/users/zZissou/events{/privacy}","received_events_url":"https://api.github.com/users/zZissou/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/zZissou/CodeCoach","description":"Project 01","fork":false,"url":"https://api.github.com/repos/zZissou/CodeCoach","forks_url":"https://api.github.com/repos/zZissou/CodeCoach/forks","keys_url":"https://api.github.com/repos/zZissou/CodeCoach/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zZissou/CodeCoach/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zZissou/CodeCoach/teams","hooks_url":"https://api.github.com/repos/zZissou/CodeCoach/hooks","issue_events_url":"https://api.github.com/repos/zZissou/CodeCoach/issues/events{/number}","events_url":"https://api.github.com/repos/zZissou/CodeCoach/events","assignees_url":"https://api.github.com/repos/zZissou/CodeCoach/assignees{/user}","branches_url":"https://api.github.com/repos/zZissou/CodeCoach/branches{/branch}","tags_url":"https://api.github.com/repos/zZissou/CodeCoach/tags","blobs_url":"https://api.github.com/repos/zZissou/CodeCoach/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zZissou/CodeCoach/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zZissou/CodeCoach/git/refs{/sha}","trees_url":"https://api.github.com/repos/zZissou/CodeCoach/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zZissou/CodeCoach/statuses/{sha}","languages_url":"https://api.github.com/repos/zZissou/CodeCoach/languages","stargazers_url":"https://api.github.com/repos/zZissou/CodeCoach/stargazers","contributors_url":"https://api.github.com/repos/zZissou/CodeCoach/contributors","subscribers_url":"https://api.github.com/repos/zZissou/CodeCoach/subscribers","subscription_url":"https://api.github.com/repos/zZissou/CodeCoach/subscription","commits_url":"https://api.github.com/repos/zZissou/CodeCoach/commits{/sha}","git_commits_url":"https://api.github.com/repos/zZissou/CodeCoach/git/commits{/sha}","comments_url":"https://api.github.com/repos/zZissou/CodeCoach/comments{/number}","issue_comment_url":"https://api.github.com/repos/zZissou/CodeCoach/issues/comments{/number}","contents_url":"https://api.github.com/repos/zZissou/CodeCoach/contents/{+path}","compare_url":"https://api.github.com/repos/zZissou/CodeCoach/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zZissou/CodeCoach/merges","archive_url":"https://api.github.com/repos/zZissou/CodeCoach/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zZissou/CodeCoach/downloads","issues_url":"https://api.github.com/repos/zZissou/CodeCoach/issues{/number}","pulls_url":"https://api.github.com/repos/zZissou/CodeCoach/pulls{/number}","milestones_url":"https://api.github.com/repos/zZissou/CodeCoach/milestones{/number}","notifications_url":"https://api.github.com/repos/zZissou/CodeCoach/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zZissou/CodeCoach/labels{/name}","releases_url":"https://api.github.com/repos/zZissou/CodeCoach/releases{/id}","deployments_url":"https://api.github.com/repos/zZissou/CodeCoach/deployments","created_at":"2016-11-16T19:54:57Z","updated_at":"2016-11-21T17:13:50Z","pushed_at":"2016-11-21T23:40:39Z","git_url":"git://github.com/zZissou/CodeCoach.git","ssh_url":"git@github.com:zZissou/CodeCoach.git","clone_url":"https://github.com/zZissou/CodeCoach.git","svn_url":"https://github.com/zZissou/CodeCoach","homepage":null,"size":5003,"stargazers_count":0,"watchers_count":0,"language":"HTML","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":0,"default_branch":"master"}},"base":{"label":"zZissou:master","ref":"master","sha":"6937b2fe659af7322c6e3fa601cda3c5797ad298","user":{"login":"zZissou","id":20157292,"avatar_url":"https://avatars.githubusercontent.com/u/20157292?v=3","gravatar_id":"","url":"https://api.github.com/users/zZissou","html_url":"https://github.com/zZissou","followers_url":"https://api.github.com/users/zZissou/followers","following_url":"https://api.github.com/users/zZissou/following{/other_user}","gists_url":"https://api.github.com/users/zZissou/gists{/gist_id}","starred_url":"https://api.github.com/users/zZissou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zZissou/subscriptions","organizations_url":"https://api.github.com/users/zZissou/orgs","repos_url":"https://api.github.com/users/zZissou/repos","events_url":"https://api.github.com/users/zZissou/events{/privacy}","received_events_url":"https://api.github.com/users/zZissou/received_events","type":"User","site_admin":false},"repo":{"id":73955770,"name":"CodeCoach","full_name":"zZissou/CodeCoach","owner":{"login":"zZissou","id":20157292,"avatar_url":"https://avatars.githubusercontent.com/u/20157292?v=3","gravatar_id":"","url":"https://api.github.com/users/zZissou","html_url":"https://github.com/zZissou","followers_url":"https://api.github.com/users/zZissou/followers","following_url":"https://api.github.com/users/zZissou/following{/other_user}","gists_url":"https://api.github.com/users/zZissou/gists{/gist_id}","starred_url":"https://api.github.com/users/zZissou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zZissou/subscriptions","organizations_url":"https://api.github.com/users/zZissou/orgs","repos_url":"https://api.github.com/users/zZissou/repos","events_url":"https://api.github.com/users/zZissou/events{/privacy}","received_events_url":"https://api.github.com/users/zZissou/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/zZissou/CodeCoach","description":"Project 01","fork":false,"url":"https://api.github.com/repos/zZissou/CodeCoach","forks_url":"https://api.github.com/repos/zZissou/CodeCoach/forks","keys_url":"https://api.github.com/repos/zZissou/CodeCoach/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zZissou/CodeCoach/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zZissou/CodeCoach/teams","hooks_url":"https://api.github.com/repos/zZissou/CodeCoach/hooks","issue_events_url":"https://api.github.com/repos/zZissou/CodeCoach/issues/events{/number}","events_url":"https://api.github.com/repos/zZissou/CodeCoach/events","assignees_url":"https://api.github.com/repos/zZissou/CodeCoach/assignees{/user}","branches_url":"https://api.github.com/repos/zZissou/CodeCoach/branches{/branch}","tags_url":"https://api.github.com/repos/zZissou/CodeCoach/tags","blobs_url":"https://api.github.com/repos/zZissou/CodeCoach/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zZissou/CodeCoach/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zZissou/CodeCoach/git/refs{/sha}","trees_url":"https://api.github.com/repos/zZissou/CodeCoach/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zZissou/CodeCoach/statuses/{sha}","languages_url":"https://api.github.com/repos/zZissou/CodeCoach/languages","stargazers_url":"https://api.github.com/repos/zZissou/CodeCoach/stargazers","contributors_url":"https://api.github.com/repos/zZissou/CodeCoach/contributors","subscribers_url":"https://api.github.com/repos/zZissou/CodeCoach/subscribers","subscription_url":"https://api.github.com/repos/zZissou/CodeCoach/subscription","commits_url":"https://api.github.com/repos/zZissou/CodeCoach/commits{/sha}","git_commits_url":"https://api.github.com/repos/zZissou/CodeCoach/git/commits{/sha}","comments_url":"https://api.github.com/repos/zZissou/CodeCoach/comments{/number}","issue_comment_url":"https://api.github.com/repos/zZissou/CodeCoach/issues/comments{/number}","contents_url":"https://api.github.com/repos/zZissou/CodeCoach/contents/{+path}","compare_url":"https://api.github.com/repos/zZissou/CodeCoach/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zZissou/CodeCoach/merges","archive_url":"https://api.github.com/repos/zZissou/CodeCoach/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zZissou/CodeCoach/downloads","issues_url":"https://api.github.com/repos/zZissou/CodeCoach/issues{/number}","pulls_url":"https://api.github.com/repos/zZissou/CodeCoach/pulls{/number}","milestones_url":"https://api.github.com/repos/zZissou/CodeCoach/milestones{/number}","notifications_url":"https://api.github.com/repos/zZissou/CodeCoach/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zZissou/CodeCoach/labels{/name}","releases_url":"https://api.github.com/repos/zZissou/CodeCoach/releases{/id}","deployments_url":"https://api.github.com/repos/zZissou/CodeCoach/deployments","created_at":"2016-11-16T19:54:57Z","updated_at":"2016-11-21T17:13:50Z","pushed_at":"2016-11-21T23:40:39Z","git_url":"git://github.com/zZissou/CodeCoach.git","ssh_url":"git@github.com:zZissou/CodeCoach.git","clone_url":"https://github.com/zZissou/CodeCoach.git","svn_url":"https://github.com/zZissou/CodeCoach","homepage":null,"size":5003,"stargazers_count":0,"watchers_count":0,"language":"HTML","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":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/zZissou/CodeCoach/pulls/21"},"html":{"href":"https://github.com/zZissou/CodeCoach/pull/21"},"issue":{"href":"https://api.github.com/repos/zZissou/CodeCoach/issues/21"},"comments":{"href":"https://api.github.com/repos/zZissou/CodeCoach/issues/21/comments"},"review_comments":{"href":"https://api.github.com/repos/zZissou/CodeCoach/pulls/21/comments"},"review_comment":{"href":"https://api.github.com/repos/zZissou/CodeCoach/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/zZissou/CodeCoach/pulls/21/commits"},"statuses":{"href":"https://api.github.com/repos/zZissou/CodeCoach/statuses/c56e1084218bb0e79216d09f274d784e29acbd72"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"cittaliu","id":22066198,"avatar_url":"https://avatars.githubusercontent.com/u/22066198?v=3","gravatar_id":"","url":"https://api.github.com/users/cittaliu","html_url":"https://github.com/cittaliu","followers_url":"https://api.github.com/users/cittaliu/followers","following_url":"https://api.github.com/users/cittaliu/following{/other_user}","gists_url":"https://api.github.com/users/cittaliu/gists{/gist_id}","starred_url":"https://api.github.com/users/cittaliu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cittaliu/subscriptions","organizations_url":"https://api.github.com/users/cittaliu/orgs","repos_url":"https://api.github.com/users/cittaliu/repos","events_url":"https://api.github.com/users/cittaliu/events{/privacy}","received_events_url":"https://api.github.com/users/cittaliu/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":1,"additions":31,"deletions":2,"changed_files":3}}
{"actor":{"display_login":"cittaliu"}}