{"action":"closed","number":7,"pull_request":{"url":"https://api.github.com/repos/bwpAj/inf/pulls/7","id":93079854,"html_url":"https://github.com/bwpAj/inf/pull/7","diff_url":"https://github.com/bwpAj/inf/pull/7.diff","patch_url":"https://github.com/bwpAj/inf/pull/7.patch","issue_url":"https://api.github.com/repos/bwpAj/inf/issues/7","number":7,"state":"closed","locked":false,"title":"解决冲突文件","user":{"login":"Scorain","id":13554243,"avatar_url":"https://avatars.githubusercontent.com/u/13554243?v=3","gravatar_id":"","url":"https://api.github.com/users/Scorain","html_url":"https://github.com/Scorain","followers_url":"https://api.github.com/users/Scorain/followers","following_url":"https://api.github.com/users/Scorain/following{/other_user}","gists_url":"https://api.github.com/users/Scorain/gists{/gist_id}","starred_url":"https://api.github.com/users/Scorain/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Scorain/subscriptions","organizations_url":"https://api.github.com/users/Scorain/orgs","repos_url":"https://api.github.com/users/Scorain/repos","events_url":"https://api.github.com/users/Scorain/events{/privacy}","received_events_url":"https://api.github.com/users/Scorain/received_events","type":"User","site_admin":false},"body":"解决冲突文件","created_at":"2016-11-10T03:10:10Z","updated_at":"2016-11-10T03:11:08Z","closed_at":"2016-11-10T03:11:08Z","merged_at":"2016-11-10T03:11:08Z","merge_commit_sha":"336523af07971e328e9f3ce0a1b7fe79244694e1","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/bwpAj/inf/pulls/7/commits","review_comments_url":"https://api.github.com/repos/bwpAj/inf/pulls/7/comments","review_comment_url":"https://api.github.com/repos/bwpAj/inf/pulls/comments{/number}","comments_url":"https://api.github.com/repos/bwpAj/inf/issues/7/comments","statuses_url":"https://api.github.com/repos/bwpAj/inf/statuses/9b69a66e305dcee6149f3a081e815a53fb3a3df9","head":{"label":"Scorain:master","ref":"master","sha":"9b69a66e305dcee6149f3a081e815a53fb3a3df9","user":{"login":"Scorain","id":13554243,"avatar_url":"https://avatars.githubusercontent.com/u/13554243?v=3","gravatar_id":"","url":"https://api.github.com/users/Scorain","html_url":"https://github.com/Scorain","followers_url":"https://api.github.com/users/Scorain/followers","following_url":"https://api.github.com/users/Scorain/following{/other_user}","gists_url":"https://api.github.com/users/Scorain/gists{/gist_id}","starred_url":"https://api.github.com/users/Scorain/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Scorain/subscriptions","organizations_url":"https://api.github.com/users/Scorain/orgs","repos_url":"https://api.github.com/users/Scorain/repos","events_url":"https://api.github.com/users/Scorain/events{/privacy}","received_events_url":"https://api.github.com/users/Scorain/received_events","type":"User","site_admin":false},"repo":{"id":73339514,"name":"inf","full_name":"Scorain/inf","owner":{"login":"Scorain","id":13554243,"avatar_url":"https://avatars.githubusercontent.com/u/13554243?v=3","gravatar_id":"","url":"https://api.github.com/users/Scorain","html_url":"https://github.com/Scorain","followers_url":"https://api.github.com/users/Scorain/followers","following_url":"https://api.github.com/users/Scorain/following{/other_user}","gists_url":"https://api.github.com/users/Scorain/gists{/gist_id}","starred_url":"https://api.github.com/users/Scorain/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Scorain/subscriptions","organizations_url":"https://api.github.com/users/Scorain/orgs","repos_url":"https://api.github.com/users/Scorain/repos","events_url":"https://api.github.com/users/Scorain/events{/privacy}","received_events_url":"https://api.github.com/users/Scorain/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Scorain/inf","description":"interface Manager of company","fork":true,"url":"https://api.github.com/repos/Scorain/inf","forks_url":"https://api.github.com/repos/Scorain/inf/forks","keys_url":"https://api.github.com/repos/Scorain/inf/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Scorain/inf/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Scorain/inf/teams","hooks_url":"https://api.github.com/repos/Scorain/inf/hooks","issue_events_url":"https://api.github.com/repos/Scorain/inf/issues/events{/number}","events_url":"https://api.github.com/repos/Scorain/inf/events","assignees_url":"https://api.github.com/repos/Scorain/inf/assignees{/user}","branches_url":"https://api.github.com/repos/Scorain/inf/branches{/branch}","tags_url":"https://api.github.com/repos/Scorain/inf/tags","blobs_url":"https://api.github.com/repos/Scorain/inf/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Scorain/inf/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Scorain/inf/git/refs{/sha}","trees_url":"https://api.github.com/repos/Scorain/inf/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Scorain/inf/statuses/{sha}","languages_url":"https://api.github.com/repos/Scorain/inf/languages","stargazers_url":"https://api.github.com/repos/Scorain/inf/stargazers","contributors_url":"https://api.github.com/repos/Scorain/inf/contributors","subscribers_url":"https://api.github.com/repos/Scorain/inf/subscribers","subscription_url":"https://api.github.com/repos/Scorain/inf/subscription","commits_url":"https://api.github.com/repos/Scorain/inf/commits{/sha}","git_commits_url":"https://api.github.com/repos/Scorain/inf/git/commits{/sha}","comments_url":"https://api.github.com/repos/Scorain/inf/comments{/number}","issue_comment_url":"https://api.github.com/repos/Scorain/inf/issues/comments{/number}","contents_url":"https://api.github.com/repos/Scorain/inf/contents/{+path}","compare_url":"https://api.github.com/repos/Scorain/inf/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Scorain/inf/merges","archive_url":"https://api.github.com/repos/Scorain/inf/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Scorain/inf/downloads","issues_url":"https://api.github.com/repos/Scorain/inf/issues{/number}","pulls_url":"https://api.github.com/repos/Scorain/inf/pulls{/number}","milestones_url":"https://api.github.com/repos/Scorain/inf/milestones{/number}","notifications_url":"https://api.github.com/repos/Scorain/inf/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Scorain/inf/labels{/name}","releases_url":"https://api.github.com/repos/Scorain/inf/releases{/id}","deployments_url":"https://api.github.com/repos/Scorain/inf/deployments","created_at":"2016-11-10T02:21:10Z","updated_at":"2016-11-10T02:21:11Z","pushed_at":"2016-11-10T03:08:37Z","git_url":"git://github.com/Scorain/inf.git","ssh_url":"git@github.com:Scorain/inf.git","clone_url":"https://github.com/Scorain/inf.git","svn_url":"https://github.com/Scorain/inf","homepage":null,"size":4560,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","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":"bwpAj:master","ref":"master","sha":"00aa3514f34bc2d58352620b8faa5ceea090fddd","user":{"login":"bwpAj","id":14292930,"avatar_url":"https://avatars.githubusercontent.com/u/14292930?v=3","gravatar_id":"","url":"https://api.github.com/users/bwpAj","html_url":"https://github.com/bwpAj","followers_url":"https://api.github.com/users/bwpAj/followers","following_url":"https://api.github.com/users/bwpAj/following{/other_user}","gists_url":"https://api.github.com/users/bwpAj/gists{/gist_id}","starred_url":"https://api.github.com/users/bwpAj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bwpAj/subscriptions","organizations_url":"https://api.github.com/users/bwpAj/orgs","repos_url":"https://api.github.com/users/bwpAj/repos","events_url":"https://api.github.com/users/bwpAj/events{/privacy}","received_events_url":"https://api.github.com/users/bwpAj/received_events","type":"User","site_admin":false},"repo":{"id":66806415,"name":"inf","full_name":"bwpAj/inf","owner":{"login":"bwpAj","id":14292930,"avatar_url":"https://avatars.githubusercontent.com/u/14292930?v=3","gravatar_id":"","url":"https://api.github.com/users/bwpAj","html_url":"https://github.com/bwpAj","followers_url":"https://api.github.com/users/bwpAj/followers","following_url":"https://api.github.com/users/bwpAj/following{/other_user}","gists_url":"https://api.github.com/users/bwpAj/gists{/gist_id}","starred_url":"https://api.github.com/users/bwpAj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bwpAj/subscriptions","organizations_url":"https://api.github.com/users/bwpAj/orgs","repos_url":"https://api.github.com/users/bwpAj/repos","events_url":"https://api.github.com/users/bwpAj/events{/privacy}","received_events_url":"https://api.github.com/users/bwpAj/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/bwpAj/inf","description":"interface Manager of company","fork":false,"url":"https://api.github.com/repos/bwpAj/inf","forks_url":"https://api.github.com/repos/bwpAj/inf/forks","keys_url":"https://api.github.com/repos/bwpAj/inf/keys{/key_id}","collaborators_url":"https://api.github.com/repos/bwpAj/inf/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/bwpAj/inf/teams","hooks_url":"https://api.github.com/repos/bwpAj/inf/hooks","issue_events_url":"https://api.github.com/repos/bwpAj/inf/issues/events{/number}","events_url":"https://api.github.com/repos/bwpAj/inf/events","assignees_url":"https://api.github.com/repos/bwpAj/inf/assignees{/user}","branches_url":"https://api.github.com/repos/bwpAj/inf/branches{/branch}","tags_url":"https://api.github.com/repos/bwpAj/inf/tags","blobs_url":"https://api.github.com/repos/bwpAj/inf/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/bwpAj/inf/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/bwpAj/inf/git/refs{/sha}","trees_url":"https://api.github.com/repos/bwpAj/inf/git/trees{/sha}","statuses_url":"https://api.github.com/repos/bwpAj/inf/statuses/{sha}","languages_url":"https://api.github.com/repos/bwpAj/inf/languages","stargazers_url":"https://api.github.com/repos/bwpAj/inf/stargazers","contributors_url":"https://api.github.com/repos/bwpAj/inf/contributors","subscribers_url":"https://api.github.com/repos/bwpAj/inf/subscribers","subscription_url":"https://api.github.com/repos/bwpAj/inf/subscription","commits_url":"https://api.github.com/repos/bwpAj/inf/commits{/sha}","git_commits_url":"https://api.github.com/repos/bwpAj/inf/git/commits{/sha}","comments_url":"https://api.github.com/repos/bwpAj/inf/comments{/number}","issue_comment_url":"https://api.github.com/repos/bwpAj/inf/issues/comments{/number}","contents_url":"https://api.github.com/repos/bwpAj/inf/contents/{+path}","compare_url":"https://api.github.com/repos/bwpAj/inf/compare/{base}...{head}","merges_url":"https://api.github.com/repos/bwpAj/inf/merges","archive_url":"https://api.github.com/repos/bwpAj/inf/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/bwpAj/inf/downloads","issues_url":"https://api.github.com/repos/bwpAj/inf/issues{/number}","pulls_url":"https://api.github.com/repos/bwpAj/inf/pulls{/number}","milestones_url":"https://api.github.com/repos/bwpAj/inf/milestones{/number}","notifications_url":"https://api.github.com/repos/bwpAj/inf/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/bwpAj/inf/labels{/name}","releases_url":"https://api.github.com/repos/bwpAj/inf/releases{/id}","deployments_url":"https://api.github.com/repos/bwpAj/inf/deployments","created_at":"2016-08-29T03:00:32Z","updated_at":"2016-11-10T03:00:33Z","pushed_at":"2016-11-10T03:11:08Z","git_url":"git://github.com/bwpAj/inf.git","ssh_url":"git@github.com:bwpAj/inf.git","clone_url":"https://github.com/bwpAj/inf.git","svn_url":"https://github.com/bwpAj/inf","homepage":null,"size":4560,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":3,"mirror_url":null,"open_issues_count":0,"forks":3,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/bwpAj/inf/pulls/7"},"html":{"href":"https://github.com/bwpAj/inf/pull/7"},"issue":{"href":"https://api.github.com/repos/bwpAj/inf/issues/7"},"comments":{"href":"https://api.github.com/repos/bwpAj/inf/issues/7/comments"},"review_comments":{"href":"https://api.github.com/repos/bwpAj/inf/pulls/7/comments"},"review_comment":{"href":"https://api.github.com/repos/bwpAj/inf/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/bwpAj/inf/pulls/7/commits"},"statuses":{"href":"https://api.github.com/repos/bwpAj/inf/statuses/9b69a66e305dcee6149f3a081e815a53fb3a3df9"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"bwpAj","id":14292930,"avatar_url":"https://avatars.githubusercontent.com/u/14292930?v=3","gravatar_id":"","url":"https://api.github.com/users/bwpAj","html_url":"https://github.com/bwpAj","followers_url":"https://api.github.com/users/bwpAj/followers","following_url":"https://api.github.com/users/bwpAj/following{/other_user}","gists_url":"https://api.github.com/users/bwpAj/gists{/gist_id}","starred_url":"https://api.github.com/users/bwpAj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bwpAj/subscriptions","organizations_url":"https://api.github.com/users/bwpAj/orgs","repos_url":"https://api.github.com/users/bwpAj/repos","events_url":"https://api.github.com/users/bwpAj/events{/privacy}","received_events_url":"https://api.github.com/users/bwpAj/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":2,"additions":5,"deletions":0,"changed_files":2}}
{"actor":{"display_login":"bwpAj"}}