{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls/1","id":36087316,"html_url":"https://github.com/LegacyKing/pcgen-newsources/pull/1","diff_url":"https://github.com/LegacyKing/pcgen-newsources/pull/1.diff","patch_url":"https://github.com/LegacyKing/pcgen-newsources/pull/1.patch","issue_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/issues/1","number":1,"state":"closed","locked":false,"title":"Conflict","user":{"login":"Distant-Scholar","id":5265981,"avatar_url":"https://avatars.githubusercontent.com/u/5265981?v=3","gravatar_id":"","url":"https://api.github.com/users/Distant-Scholar","html_url":"https://github.com/Distant-Scholar","followers_url":"https://api.github.com/users/Distant-Scholar/followers","following_url":"https://api.github.com/users/Distant-Scholar/following{/other_user}","gists_url":"https://api.github.com/users/Distant-Scholar/gists{/gist_id}","starred_url":"https://api.github.com/users/Distant-Scholar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Distant-Scholar/subscriptions","organizations_url":"https://api.github.com/users/Distant-Scholar/orgs","repos_url":"https://api.github.com/users/Distant-Scholar/repos","events_url":"https://api.github.com/users/Distant-Scholar/events{/privacy}","received_events_url":"https://api.github.com/users/Distant-Scholar/received_events","type":"User","site_admin":false},"body":"This should finish up Chapter 3","created_at":"2015-05-23T13:07:41Z","updated_at":"2015-06-13T20:14:59Z","closed_at":"2015-06-13T20:14:59Z","merged_at":null,"merge_commit_sha":"dde93376eebae377eec2c631bf21201dd07bcba8","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls/1/commits","review_comments_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls/1/comments","review_comment_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls/comments{/number}","comments_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/issues/1/comments","statuses_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/statuses/f4a087a30b117cc625fc812bb679868d3e150e50","head":{"label":"Distant-Scholar:conflict","ref":"conflict","sha":"f4a087a30b117cc625fc812bb679868d3e150e50","user":{"login":"Distant-Scholar","id":5265981,"avatar_url":"https://avatars.githubusercontent.com/u/5265981?v=3","gravatar_id":"","url":"https://api.github.com/users/Distant-Scholar","html_url":"https://github.com/Distant-Scholar","followers_url":"https://api.github.com/users/Distant-Scholar/followers","following_url":"https://api.github.com/users/Distant-Scholar/following{/other_user}","gists_url":"https://api.github.com/users/Distant-Scholar/gists{/gist_id}","starred_url":"https://api.github.com/users/Distant-Scholar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Distant-Scholar/subscriptions","organizations_url":"https://api.github.com/users/Distant-Scholar/orgs","repos_url":"https://api.github.com/users/Distant-Scholar/repos","events_url":"https://api.github.com/users/Distant-Scholar/events{/privacy}","received_events_url":"https://api.github.com/users/Distant-Scholar/received_events","type":"User","site_admin":false},"repo":{"id":26779688,"name":"NewSources","full_name":"Distant-Scholar/NewSources","owner":{"login":"Distant-Scholar","id":5265981,"avatar_url":"https://avatars.githubusercontent.com/u/5265981?v=3","gravatar_id":"","url":"https://api.github.com/users/Distant-Scholar","html_url":"https://github.com/Distant-Scholar","followers_url":"https://api.github.com/users/Distant-Scholar/followers","following_url":"https://api.github.com/users/Distant-Scholar/following{/other_user}","gists_url":"https://api.github.com/users/Distant-Scholar/gists{/gist_id}","starred_url":"https://api.github.com/users/Distant-Scholar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Distant-Scholar/subscriptions","organizations_url":"https://api.github.com/users/Distant-Scholar/orgs","repos_url":"https://api.github.com/users/Distant-Scholar/repos","events_url":"https://api.github.com/users/Distant-Scholar/events{/privacy}","received_events_url":"https://api.github.com/users/Distant-Scholar/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Distant-Scholar/NewSources","description":"","fork":true,"url":"https://api.github.com/repos/Distant-Scholar/NewSources","forks_url":"https://api.github.com/repos/Distant-Scholar/NewSources/forks","keys_url":"https://api.github.com/repos/Distant-Scholar/NewSources/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Distant-Scholar/NewSources/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Distant-Scholar/NewSources/teams","hooks_url":"https://api.github.com/repos/Distant-Scholar/NewSources/hooks","issue_events_url":"https://api.github.com/repos/Distant-Scholar/NewSources/issues/events{/number}","events_url":"https://api.github.com/repos/Distant-Scholar/NewSources/events","assignees_url":"https://api.github.com/repos/Distant-Scholar/NewSources/assignees{/user}","branches_url":"https://api.github.com/repos/Distant-Scholar/NewSources/branches{/branch}","tags_url":"https://api.github.com/repos/Distant-Scholar/NewSources/tags","blobs_url":"https://api.github.com/repos/Distant-Scholar/NewSources/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Distant-Scholar/NewSources/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Distant-Scholar/NewSources/git/refs{/sha}","trees_url":"https://api.github.com/repos/Distant-Scholar/NewSources/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Distant-Scholar/NewSources/statuses/{sha}","languages_url":"https://api.github.com/repos/Distant-Scholar/NewSources/languages","stargazers_url":"https://api.github.com/repos/Distant-Scholar/NewSources/stargazers","contributors_url":"https://api.github.com/repos/Distant-Scholar/NewSources/contributors","subscribers_url":"https://api.github.com/repos/Distant-Scholar/NewSources/subscribers","subscription_url":"https://api.github.com/repos/Distant-Scholar/NewSources/subscription","commits_url":"https://api.github.com/repos/Distant-Scholar/NewSources/commits{/sha}","git_commits_url":"https://api.github.com/repos/Distant-Scholar/NewSources/git/commits{/sha}","comments_url":"https://api.github.com/repos/Distant-Scholar/NewSources/comments{/number}","issue_comment_url":"https://api.github.com/repos/Distant-Scholar/NewSources/issues/comments{/number}","contents_url":"https://api.github.com/repos/Distant-Scholar/NewSources/contents/{+path}","compare_url":"https://api.github.com/repos/Distant-Scholar/NewSources/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Distant-Scholar/NewSources/merges","archive_url":"https://api.github.com/repos/Distant-Scholar/NewSources/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Distant-Scholar/NewSources/downloads","issues_url":"https://api.github.com/repos/Distant-Scholar/NewSources/issues{/number}","pulls_url":"https://api.github.com/repos/Distant-Scholar/NewSources/pulls{/number}","milestones_url":"https://api.github.com/repos/Distant-Scholar/NewSources/milestones{/number}","notifications_url":"https://api.github.com/repos/Distant-Scholar/NewSources/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Distant-Scholar/NewSources/labels{/name}","releases_url":"https://api.github.com/repos/Distant-Scholar/NewSources/releases{/id}","created_at":"2014-11-17T22:09:17Z","updated_at":"2015-03-04T16:44:46Z","pushed_at":"2015-06-13T20:14:59Z","git_url":"git://github.com/Distant-Scholar/NewSources.git","ssh_url":"git@github.com:Distant-Scholar/NewSources.git","clone_url":"https://github.com/Distant-Scholar/NewSources.git","svn_url":"https://github.com/Distant-Scholar/NewSources","homepage":null,"size":36900,"stargazers_count":0,"watchers_count":0,"language":"XSLT","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":"LegacyKing:acg_work","ref":"acg_work","sha":"d44da7ca072b824c0310483530291d328d07d996","user":{"login":"LegacyKing","id":2759875,"avatar_url":"https://avatars.githubusercontent.com/u/2759875?v=3","gravatar_id":"","url":"https://api.github.com/users/LegacyKing","html_url":"https://github.com/LegacyKing","followers_url":"https://api.github.com/users/LegacyKing/followers","following_url":"https://api.github.com/users/LegacyKing/following{/other_user}","gists_url":"https://api.github.com/users/LegacyKing/gists{/gist_id}","starred_url":"https://api.github.com/users/LegacyKing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LegacyKing/subscriptions","organizations_url":"https://api.github.com/users/LegacyKing/orgs","repos_url":"https://api.github.com/users/LegacyKing/repos","events_url":"https://api.github.com/users/LegacyKing/events{/privacy}","received_events_url":"https://api.github.com/users/LegacyKing/received_events","type":"User","site_admin":false},"repo":{"id":28756005,"name":"pcgen-newsources","full_name":"LegacyKing/pcgen-newsources","owner":{"login":"LegacyKing","id":2759875,"avatar_url":"https://avatars.githubusercontent.com/u/2759875?v=3","gravatar_id":"","url":"https://api.github.com/users/LegacyKing","html_url":"https://github.com/LegacyKing","followers_url":"https://api.github.com/users/LegacyKing/followers","following_url":"https://api.github.com/users/LegacyKing/following{/other_user}","gists_url":"https://api.github.com/users/LegacyKing/gists{/gist_id}","starred_url":"https://api.github.com/users/LegacyKing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LegacyKing/subscriptions","organizations_url":"https://api.github.com/users/LegacyKing/orgs","repos_url":"https://api.github.com/users/LegacyKing/repos","events_url":"https://api.github.com/users/LegacyKing/events{/privacy}","received_events_url":"https://api.github.com/users/LegacyKing/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/LegacyKing/pcgen-newsources","description":"New Source Development for official PCGen release","fork":true,"url":"https://api.github.com/repos/LegacyKing/pcgen-newsources","forks_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/forks","keys_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/keys{/key_id}","collaborators_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/teams","hooks_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/hooks","issue_events_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/issues/events{/number}","events_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/events","assignees_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/assignees{/user}","branches_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/branches{/branch}","tags_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/tags","blobs_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/git/refs{/sha}","trees_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/git/trees{/sha}","statuses_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/statuses/{sha}","languages_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/languages","stargazers_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/stargazers","contributors_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/contributors","subscribers_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/subscribers","subscription_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/subscription","commits_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/commits{/sha}","git_commits_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/git/commits{/sha}","comments_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/comments{/number}","issue_comment_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/issues/comments{/number}","contents_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/contents/{+path}","compare_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/compare/{base}...{head}","merges_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/merges","archive_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/downloads","issues_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/issues{/number}","pulls_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls{/number}","milestones_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/milestones{/number}","notifications_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/labels{/name}","releases_url":"https://api.github.com/repos/LegacyKing/pcgen-newsources/releases{/id}","created_at":"2015-01-03T22:11:23Z","updated_at":"2015-05-12T07:43:42Z","pushed_at":"2015-05-30T18:54:26Z","git_url":"git://github.com/LegacyKing/pcgen-newsources.git","ssh_url":"git@github.com:LegacyKing/pcgen-newsources.git","clone_url":"https://github.com/LegacyKing/pcgen-newsources.git","svn_url":"https://github.com/LegacyKing/pcgen-newsources","homepage":"http://pcgen.org","size":37886,"stargazers_count":2,"watchers_count":2,"language":"XSLT","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":2,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls/1"},"html":{"href":"https://github.com/LegacyKing/pcgen-newsources/pull/1"},"issue":{"href":"https://api.github.com/repos/LegacyKing/pcgen-newsources/issues/1"},"comments":{"href":"https://api.github.com/repos/LegacyKing/pcgen-newsources/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/LegacyKing/pcgen-newsources/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/LegacyKing/pcgen-newsources/statuses/f4a087a30b117cc625fc812bb679868d3e150e50"}},"merged":false,"mergeable":true,"mergeable_state":"clean","merged_by":null,"comments":0,"review_comments":0,"commits":14,"additions":315,"deletions":320,"changed_files":3}}