{"action":"closed","number":27,"pull_request":{"url":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls/27","id":82077517,"html_url":"https://github.com/yunzhiclub/YZCMS/pull/27","diff_url":"https://github.com/yunzhiclub/YZCMS/pull/27.diff","patch_url":"https://github.com/yunzhiclub/YZCMS/pull/27.patch","issue_url":"https://api.github.com/repos/yunzhiclub/YZCMS/issues/27","number":27,"state":"closed","locked":false,"title":"解决冲突","user":{"login":"chuhang123","id":16712674,"avatar_url":"https://avatars.githubusercontent.com/u/16712674?v=3","gravatar_id":"","url":"https://api.github.com/users/chuhang123","html_url":"https://github.com/chuhang123","followers_url":"https://api.github.com/users/chuhang123/followers","following_url":"https://api.github.com/users/chuhang123/following{/other_user}","gists_url":"https://api.github.com/users/chuhang123/gists{/gist_id}","starred_url":"https://api.github.com/users/chuhang123/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chuhang123/subscriptions","organizations_url":"https://api.github.com/users/chuhang123/orgs","repos_url":"https://api.github.com/users/chuhang123/repos","events_url":"https://api.github.com/users/chuhang123/events{/privacy}","received_events_url":"https://api.github.com/users/chuhang123/received_events","type":"User","site_admin":false},"body":null,"created_at":"2016-08-20T12:28:46Z","updated_at":"2016-08-20T12:33:45Z","closed_at":"2016-08-20T12:33:45Z","merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls/27/commits","review_comments_url":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls/27/comments","review_comment_url":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls/comments{/number}","comments_url":"https://api.github.com/repos/yunzhiclub/YZCMS/issues/27/comments","statuses_url":"https://api.github.com/repos/yunzhiclub/YZCMS/statuses/db95a438075d5e450a1e538ac155f86827aaf462","head":{"label":"yunzhiclub:chuhang","ref":"chuhang","sha":"db95a438075d5e450a1e538ac155f86827aaf462","user":{"login":"yunzhiclub","id":15880432,"avatar_url":"https://avatars.githubusercontent.com/u/15880432?v=3","gravatar_id":"","url":"https://api.github.com/users/yunzhiclub","html_url":"https://github.com/yunzhiclub","followers_url":"https://api.github.com/users/yunzhiclub/followers","following_url":"https://api.github.com/users/yunzhiclub/following{/other_user}","gists_url":"https://api.github.com/users/yunzhiclub/gists{/gist_id}","starred_url":"https://api.github.com/users/yunzhiclub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yunzhiclub/subscriptions","organizations_url":"https://api.github.com/users/yunzhiclub/orgs","repos_url":"https://api.github.com/users/yunzhiclub/repos","events_url":"https://api.github.com/users/yunzhiclub/events{/privacy}","received_events_url":"https://api.github.com/users/yunzhiclub/received_events","type":"Organization","site_admin":false},"repo":{"id":65956270,"name":"YZCMS","full_name":"yunzhiclub/YZCMS","owner":{"login":"yunzhiclub","id":15880432,"avatar_url":"https://avatars.githubusercontent.com/u/15880432?v=3","gravatar_id":"","url":"https://api.github.com/users/yunzhiclub","html_url":"https://github.com/yunzhiclub","followers_url":"https://api.github.com/users/yunzhiclub/followers","following_url":"https://api.github.com/users/yunzhiclub/following{/other_user}","gists_url":"https://api.github.com/users/yunzhiclub/gists{/gist_id}","starred_url":"https://api.github.com/users/yunzhiclub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yunzhiclub/subscriptions","organizations_url":"https://api.github.com/users/yunzhiclub/orgs","repos_url":"https://api.github.com/users/yunzhiclub/repos","events_url":"https://api.github.com/users/yunzhiclub/events{/privacy}","received_events_url":"https://api.github.com/users/yunzhiclub/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/yunzhiclub/YZCMS","description":"cms","fork":false,"url":"https://api.github.com/repos/yunzhiclub/YZCMS","forks_url":"https://api.github.com/repos/yunzhiclub/YZCMS/forks","keys_url":"https://api.github.com/repos/yunzhiclub/YZCMS/keys{/key_id}","collaborators_url":"https://api.github.com/repos/yunzhiclub/YZCMS/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/yunzhiclub/YZCMS/teams","hooks_url":"https://api.github.com/repos/yunzhiclub/YZCMS/hooks","issue_events_url":"https://api.github.com/repos/yunzhiclub/YZCMS/issues/events{/number}","events_url":"https://api.github.com/repos/yunzhiclub/YZCMS/events","assignees_url":"https://api.github.com/repos/yunzhiclub/YZCMS/assignees{/user}","branches_url":"https://api.github.com/repos/yunzhiclub/YZCMS/branches{/branch}","tags_url":"https://api.github.com/repos/yunzhiclub/YZCMS/tags","blobs_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/refs{/sha}","trees_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/trees{/sha}","statuses_url":"https://api.github.com/repos/yunzhiclub/YZCMS/statuses/{sha}","languages_url":"https://api.github.com/repos/yunzhiclub/YZCMS/languages","stargazers_url":"https://api.github.com/repos/yunzhiclub/YZCMS/stargazers","contributors_url":"https://api.github.com/repos/yunzhiclub/YZCMS/contributors","subscribers_url":"https://api.github.com/repos/yunzhiclub/YZCMS/subscribers","subscription_url":"https://api.github.com/repos/yunzhiclub/YZCMS/subscription","commits_url":"https://api.github.com/repos/yunzhiclub/YZCMS/commits{/sha}","git_commits_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/commits{/sha}","comments_url":"https://api.github.com/repos/yunzhiclub/YZCMS/comments{/number}","issue_comment_url":"https://api.github.com/repos/yunzhiclub/YZCMS/issues/comments{/number}","contents_url":"https://api.github.com/repos/yunzhiclub/YZCMS/contents/{+path}","compare_url":"https://api.github.com/repos/yunzhiclub/YZCMS/compare/{base}...{head}","merges_url":"https://api.github.com/repos/yunzhiclub/YZCMS/merges","archive_url":"https://api.github.com/repos/yunzhiclub/YZCMS/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/yunzhiclub/YZCMS/downloads","issues_url":"https://api.github.com/repos/yunzhiclub/YZCMS/issues{/number}","pulls_url":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls{/number}","milestones_url":"https://api.github.com/repos/yunzhiclub/YZCMS/milestones{/number}","notifications_url":"https://api.github.com/repos/yunzhiclub/YZCMS/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/yunzhiclub/YZCMS/labels{/name}","releases_url":"https://api.github.com/repos/yunzhiclub/YZCMS/releases{/id}","deployments_url":"https://api.github.com/repos/yunzhiclub/YZCMS/deployments","created_at":"2016-08-18T01:56:03Z","updated_at":"2016-08-18T01:56:55Z","pushed_at":"2016-08-20T12:28:46Z","git_url":"git://github.com/yunzhiclub/YZCMS.git","ssh_url":"git@github.com:yunzhiclub/YZCMS.git","clone_url":"https://github.com/yunzhiclub/YZCMS.git","svn_url":"https://github.com/yunzhiclub/YZCMS","homepage":null,"size":5486,"stargazers_count":0,"watchers_count":0,"language":"PHP","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":"yunzhiclub:development","ref":"development","sha":"c393bd9a4531e4e593378396f4d8497f27b15c96","user":{"login":"yunzhiclub","id":15880432,"avatar_url":"https://avatars.githubusercontent.com/u/15880432?v=3","gravatar_id":"","url":"https://api.github.com/users/yunzhiclub","html_url":"https://github.com/yunzhiclub","followers_url":"https://api.github.com/users/yunzhiclub/followers","following_url":"https://api.github.com/users/yunzhiclub/following{/other_user}","gists_url":"https://api.github.com/users/yunzhiclub/gists{/gist_id}","starred_url":"https://api.github.com/users/yunzhiclub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yunzhiclub/subscriptions","organizations_url":"https://api.github.com/users/yunzhiclub/orgs","repos_url":"https://api.github.com/users/yunzhiclub/repos","events_url":"https://api.github.com/users/yunzhiclub/events{/privacy}","received_events_url":"https://api.github.com/users/yunzhiclub/received_events","type":"Organization","site_admin":false},"repo":{"id":65956270,"name":"YZCMS","full_name":"yunzhiclub/YZCMS","owner":{"login":"yunzhiclub","id":15880432,"avatar_url":"https://avatars.githubusercontent.com/u/15880432?v=3","gravatar_id":"","url":"https://api.github.com/users/yunzhiclub","html_url":"https://github.com/yunzhiclub","followers_url":"https://api.github.com/users/yunzhiclub/followers","following_url":"https://api.github.com/users/yunzhiclub/following{/other_user}","gists_url":"https://api.github.com/users/yunzhiclub/gists{/gist_id}","starred_url":"https://api.github.com/users/yunzhiclub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yunzhiclub/subscriptions","organizations_url":"https://api.github.com/users/yunzhiclub/orgs","repos_url":"https://api.github.com/users/yunzhiclub/repos","events_url":"https://api.github.com/users/yunzhiclub/events{/privacy}","received_events_url":"https://api.github.com/users/yunzhiclub/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/yunzhiclub/YZCMS","description":"cms","fork":false,"url":"https://api.github.com/repos/yunzhiclub/YZCMS","forks_url":"https://api.github.com/repos/yunzhiclub/YZCMS/forks","keys_url":"https://api.github.com/repos/yunzhiclub/YZCMS/keys{/key_id}","collaborators_url":"https://api.github.com/repos/yunzhiclub/YZCMS/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/yunzhiclub/YZCMS/teams","hooks_url":"https://api.github.com/repos/yunzhiclub/YZCMS/hooks","issue_events_url":"https://api.github.com/repos/yunzhiclub/YZCMS/issues/events{/number}","events_url":"https://api.github.com/repos/yunzhiclub/YZCMS/events","assignees_url":"https://api.github.com/repos/yunzhiclub/YZCMS/assignees{/user}","branches_url":"https://api.github.com/repos/yunzhiclub/YZCMS/branches{/branch}","tags_url":"https://api.github.com/repos/yunzhiclub/YZCMS/tags","blobs_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/refs{/sha}","trees_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/trees{/sha}","statuses_url":"https://api.github.com/repos/yunzhiclub/YZCMS/statuses/{sha}","languages_url":"https://api.github.com/repos/yunzhiclub/YZCMS/languages","stargazers_url":"https://api.github.com/repos/yunzhiclub/YZCMS/stargazers","contributors_url":"https://api.github.com/repos/yunzhiclub/YZCMS/contributors","subscribers_url":"https://api.github.com/repos/yunzhiclub/YZCMS/subscribers","subscription_url":"https://api.github.com/repos/yunzhiclub/YZCMS/subscription","commits_url":"https://api.github.com/repos/yunzhiclub/YZCMS/commits{/sha}","git_commits_url":"https://api.github.com/repos/yunzhiclub/YZCMS/git/commits{/sha}","comments_url":"https://api.github.com/repos/yunzhiclub/YZCMS/comments{/number}","issue_comment_url":"https://api.github.com/repos/yunzhiclub/YZCMS/issues/comments{/number}","contents_url":"https://api.github.com/repos/yunzhiclub/YZCMS/contents/{+path}","compare_url":"https://api.github.com/repos/yunzhiclub/YZCMS/compare/{base}...{head}","merges_url":"https://api.github.com/repos/yunzhiclub/YZCMS/merges","archive_url":"https://api.github.com/repos/yunzhiclub/YZCMS/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/yunzhiclub/YZCMS/downloads","issues_url":"https://api.github.com/repos/yunzhiclub/YZCMS/issues{/number}","pulls_url":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls{/number}","milestones_url":"https://api.github.com/repos/yunzhiclub/YZCMS/milestones{/number}","notifications_url":"https://api.github.com/repos/yunzhiclub/YZCMS/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/yunzhiclub/YZCMS/labels{/name}","releases_url":"https://api.github.com/repos/yunzhiclub/YZCMS/releases{/id}","deployments_url":"https://api.github.com/repos/yunzhiclub/YZCMS/deployments","created_at":"2016-08-18T01:56:03Z","updated_at":"2016-08-18T01:56:55Z","pushed_at":"2016-08-20T12:28:46Z","git_url":"git://github.com/yunzhiclub/YZCMS.git","ssh_url":"git@github.com:yunzhiclub/YZCMS.git","clone_url":"https://github.com/yunzhiclub/YZCMS.git","svn_url":"https://github.com/yunzhiclub/YZCMS","homepage":null,"size":5486,"stargazers_count":0,"watchers_count":0,"language":"PHP","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/yunzhiclub/YZCMS/pulls/27"},"html":{"href":"https://github.com/yunzhiclub/YZCMS/pull/27"},"issue":{"href":"https://api.github.com/repos/yunzhiclub/YZCMS/issues/27"},"comments":{"href":"https://api.github.com/repos/yunzhiclub/YZCMS/issues/27/comments"},"review_comments":{"href":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls/27/comments"},"review_comment":{"href":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/yunzhiclub/YZCMS/pulls/27/commits"},"statuses":{"href":"https://api.github.com/repos/yunzhiclub/YZCMS/statuses/db95a438075d5e450a1e538ac155f86827aaf462"}},"merged":false,"mergeable":false,"mergeable_state":"dirty","merged_by":null,"comments":1,"review_comments":0,"commits":8,"additions":71,"deletions":14,"changed_files":8}}
{"actor":{"display_login":"litian1218"}}