{"action":"closed","number":1,"pull_request":{"url":"https://api.github.com/repos/jmazouri/CIAngel/pulls/1","id":67958321,"html_url":"https://github.com/jmazouri/CIAngel/pull/1","diff_url":"https://github.com/jmazouri/CIAngel/pull/1.diff","patch_url":"https://github.com/jmazouri/CIAngel/pull/1.patch","issue_url":"https://api.github.com/repos/jmazouri/CIAngel/issues/1","number":1,"state":"closed","locked":false,"title":"resolved conflicts between our work","user":{"login":"superbudvar","id":7580433,"avatar_url":"https://avatars.githubusercontent.com/u/7580433?v=3","gravatar_id":"","url":"https://api.github.com/users/superbudvar","html_url":"https://github.com/superbudvar","followers_url":"https://api.github.com/users/superbudvar/followers","following_url":"https://api.github.com/users/superbudvar/following{/other_user}","gists_url":"https://api.github.com/users/superbudvar/gists{/gist_id}","starred_url":"https://api.github.com/users/superbudvar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/superbudvar/subscriptions","organizations_url":"https://api.github.com/users/superbudvar/orgs","repos_url":"https://api.github.com/users/superbudvar/repos","events_url":"https://api.github.com/users/superbudvar/events{/privacy}","received_events_url":"https://api.github.com/users/superbudvar/received_events","type":"User","site_admin":false},"body":"Here's a resolve for the conflict between our work. Thought I'd be neighbourly :smile: ","created_at":"2016-04-26T21:06:56Z","updated_at":"2016-04-26T21:07:53Z","closed_at":"2016-04-26T21:07:53Z","merged_at":"2016-04-26T21:07:53Z","merge_commit_sha":"8fb2297457eaa2bcb0a63dd8ad1125306da2d628","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/jmazouri/CIAngel/pulls/1/commits","review_comments_url":"https://api.github.com/repos/jmazouri/CIAngel/pulls/1/comments","review_comment_url":"https://api.github.com/repos/jmazouri/CIAngel/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jmazouri/CIAngel/issues/1/comments","statuses_url":"https://api.github.com/repos/jmazouri/CIAngel/statuses/57f744927b8a6a615df015623fa4e6ffece1e2db","head":{"label":"superbudvar:filter-conflict-resolve","ref":"filter-conflict-resolve","sha":"57f744927b8a6a615df015623fa4e6ffece1e2db","user":{"login":"superbudvar","id":7580433,"avatar_url":"https://avatars.githubusercontent.com/u/7580433?v=3","gravatar_id":"","url":"https://api.github.com/users/superbudvar","html_url":"https://github.com/superbudvar","followers_url":"https://api.github.com/users/superbudvar/followers","following_url":"https://api.github.com/users/superbudvar/following{/other_user}","gists_url":"https://api.github.com/users/superbudvar/gists{/gist_id}","starred_url":"https://api.github.com/users/superbudvar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/superbudvar/subscriptions","organizations_url":"https://api.github.com/users/superbudvar/orgs","repos_url":"https://api.github.com/users/superbudvar/repos","events_url":"https://api.github.com/users/superbudvar/events{/privacy}","received_events_url":"https://api.github.com/users/superbudvar/received_events","type":"User","site_admin":false},"repo":{"id":57032017,"name":"CIAngel","full_name":"superbudvar/CIAngel","owner":{"login":"superbudvar","id":7580433,"avatar_url":"https://avatars.githubusercontent.com/u/7580433?v=3","gravatar_id":"","url":"https://api.github.com/users/superbudvar","html_url":"https://github.com/superbudvar","followers_url":"https://api.github.com/users/superbudvar/followers","following_url":"https://api.github.com/users/superbudvar/following{/other_user}","gists_url":"https://api.github.com/users/superbudvar/gists{/gist_id}","starred_url":"https://api.github.com/users/superbudvar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/superbudvar/subscriptions","organizations_url":"https://api.github.com/users/superbudvar/orgs","repos_url":"https://api.github.com/users/superbudvar/repos","events_url":"https://api.github.com/users/superbudvar/events{/privacy}","received_events_url":"https://api.github.com/users/superbudvar/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/superbudvar/CIAngel","description":"Download GOOD CIAs on your 3DS!","fork":true,"url":"https://api.github.com/repos/superbudvar/CIAngel","forks_url":"https://api.github.com/repos/superbudvar/CIAngel/forks","keys_url":"https://api.github.com/repos/superbudvar/CIAngel/keys{/key_id}","collaborators_url":"https://api.github.com/repos/superbudvar/CIAngel/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/superbudvar/CIAngel/teams","hooks_url":"https://api.github.com/repos/superbudvar/CIAngel/hooks","issue_events_url":"https://api.github.com/repos/superbudvar/CIAngel/issues/events{/number}","events_url":"https://api.github.com/repos/superbudvar/CIAngel/events","assignees_url":"https://api.github.com/repos/superbudvar/CIAngel/assignees{/user}","branches_url":"https://api.github.com/repos/superbudvar/CIAngel/branches{/branch}","tags_url":"https://api.github.com/repos/superbudvar/CIAngel/tags","blobs_url":"https://api.github.com/repos/superbudvar/CIAngel/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/superbudvar/CIAngel/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/superbudvar/CIAngel/git/refs{/sha}","trees_url":"https://api.github.com/repos/superbudvar/CIAngel/git/trees{/sha}","statuses_url":"https://api.github.com/repos/superbudvar/CIAngel/statuses/{sha}","languages_url":"https://api.github.com/repos/superbudvar/CIAngel/languages","stargazers_url":"https://api.github.com/repos/superbudvar/CIAngel/stargazers","contributors_url":"https://api.github.com/repos/superbudvar/CIAngel/contributors","subscribers_url":"https://api.github.com/repos/superbudvar/CIAngel/subscribers","subscription_url":"https://api.github.com/repos/superbudvar/CIAngel/subscription","commits_url":"https://api.github.com/repos/superbudvar/CIAngel/commits{/sha}","git_commits_url":"https://api.github.com/repos/superbudvar/CIAngel/git/commits{/sha}","comments_url":"https://api.github.com/repos/superbudvar/CIAngel/comments{/number}","issue_comment_url":"https://api.github.com/repos/superbudvar/CIAngel/issues/comments{/number}","contents_url":"https://api.github.com/repos/superbudvar/CIAngel/contents/{+path}","compare_url":"https://api.github.com/repos/superbudvar/CIAngel/compare/{base}...{head}","merges_url":"https://api.github.com/repos/superbudvar/CIAngel/merges","archive_url":"https://api.github.com/repos/superbudvar/CIAngel/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/superbudvar/CIAngel/downloads","issues_url":"https://api.github.com/repos/superbudvar/CIAngel/issues{/number}","pulls_url":"https://api.github.com/repos/superbudvar/CIAngel/pulls{/number}","milestones_url":"https://api.github.com/repos/superbudvar/CIAngel/milestones{/number}","notifications_url":"https://api.github.com/repos/superbudvar/CIAngel/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/superbudvar/CIAngel/labels{/name}","releases_url":"https://api.github.com/repos/superbudvar/CIAngel/releases{/id}","deployments_url":"https://api.github.com/repos/superbudvar/CIAngel/deployments","created_at":"2016-04-25T10:10:50Z","updated_at":"2016-04-25T10:10:50Z","pushed_at":"2016-04-26T21:04:35Z","git_url":"git://github.com/superbudvar/CIAngel.git","ssh_url":"git@github.com:superbudvar/CIAngel.git","clone_url":"https://github.com/superbudvar/CIAngel.git","svn_url":"https://github.com/superbudvar/CIAngel","homepage":"","size":3197,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":false,"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":"jmazouri:master","ref":"master","sha":"b2315fceb0120a71f6932a20896d3eb7b582b75b","user":{"login":"jmazouri","id":1239222,"avatar_url":"https://avatars.githubusercontent.com/u/1239222?v=3","gravatar_id":"","url":"https://api.github.com/users/jmazouri","html_url":"https://github.com/jmazouri","followers_url":"https://api.github.com/users/jmazouri/followers","following_url":"https://api.github.com/users/jmazouri/following{/other_user}","gists_url":"https://api.github.com/users/jmazouri/gists{/gist_id}","starred_url":"https://api.github.com/users/jmazouri/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmazouri/subscriptions","organizations_url":"https://api.github.com/users/jmazouri/orgs","repos_url":"https://api.github.com/users/jmazouri/repos","events_url":"https://api.github.com/users/jmazouri/events{/privacy}","received_events_url":"https://api.github.com/users/jmazouri/received_events","type":"User","site_admin":false},"repo":{"id":56999227,"name":"CIAngel","full_name":"jmazouri/CIAngel","owner":{"login":"jmazouri","id":1239222,"avatar_url":"https://avatars.githubusercontent.com/u/1239222?v=3","gravatar_id":"","url":"https://api.github.com/users/jmazouri","html_url":"https://github.com/jmazouri","followers_url":"https://api.github.com/users/jmazouri/followers","following_url":"https://api.github.com/users/jmazouri/following{/other_user}","gists_url":"https://api.github.com/users/jmazouri/gists{/gist_id}","starred_url":"https://api.github.com/users/jmazouri/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmazouri/subscriptions","organizations_url":"https://api.github.com/users/jmazouri/orgs","repos_url":"https://api.github.com/users/jmazouri/repos","events_url":"https://api.github.com/users/jmazouri/events{/privacy}","received_events_url":"https://api.github.com/users/jmazouri/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jmazouri/CIAngel","description":"Download GOOD CIAs on your 3DS!","fork":true,"url":"https://api.github.com/repos/jmazouri/CIAngel","forks_url":"https://api.github.com/repos/jmazouri/CIAngel/forks","keys_url":"https://api.github.com/repos/jmazouri/CIAngel/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jmazouri/CIAngel/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jmazouri/CIAngel/teams","hooks_url":"https://api.github.com/repos/jmazouri/CIAngel/hooks","issue_events_url":"https://api.github.com/repos/jmazouri/CIAngel/issues/events{/number}","events_url":"https://api.github.com/repos/jmazouri/CIAngel/events","assignees_url":"https://api.github.com/repos/jmazouri/CIAngel/assignees{/user}","branches_url":"https://api.github.com/repos/jmazouri/CIAngel/branches{/branch}","tags_url":"https://api.github.com/repos/jmazouri/CIAngel/tags","blobs_url":"https://api.github.com/repos/jmazouri/CIAngel/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jmazouri/CIAngel/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jmazouri/CIAngel/git/refs{/sha}","trees_url":"https://api.github.com/repos/jmazouri/CIAngel/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jmazouri/CIAngel/statuses/{sha}","languages_url":"https://api.github.com/repos/jmazouri/CIAngel/languages","stargazers_url":"https://api.github.com/repos/jmazouri/CIAngel/stargazers","contributors_url":"https://api.github.com/repos/jmazouri/CIAngel/contributors","subscribers_url":"https://api.github.com/repos/jmazouri/CIAngel/subscribers","subscription_url":"https://api.github.com/repos/jmazouri/CIAngel/subscription","commits_url":"https://api.github.com/repos/jmazouri/CIAngel/commits{/sha}","git_commits_url":"https://api.github.com/repos/jmazouri/CIAngel/git/commits{/sha}","comments_url":"https://api.github.com/repos/jmazouri/CIAngel/comments{/number}","issue_comment_url":"https://api.github.com/repos/jmazouri/CIAngel/issues/comments{/number}","contents_url":"https://api.github.com/repos/jmazouri/CIAngel/contents/{+path}","compare_url":"https://api.github.com/repos/jmazouri/CIAngel/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jmazouri/CIAngel/merges","archive_url":"https://api.github.com/repos/jmazouri/CIAngel/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jmazouri/CIAngel/downloads","issues_url":"https://api.github.com/repos/jmazouri/CIAngel/issues{/number}","pulls_url":"https://api.github.com/repos/jmazouri/CIAngel/pulls{/number}","milestones_url":"https://api.github.com/repos/jmazouri/CIAngel/milestones{/number}","notifications_url":"https://api.github.com/repos/jmazouri/CIAngel/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jmazouri/CIAngel/labels{/name}","releases_url":"https://api.github.com/repos/jmazouri/CIAngel/releases{/id}","deployments_url":"https://api.github.com/repos/jmazouri/CIAngel/deployments","created_at":"2016-04-24T23:34:09Z","updated_at":"2016-04-24T23:34:10Z","pushed_at":"2016-04-26T21:07:53Z","git_url":"git://github.com/jmazouri/CIAngel.git","ssh_url":"git@github.com:jmazouri/CIAngel.git","clone_url":"https://github.com/jmazouri/CIAngel.git","svn_url":"https://github.com/jmazouri/CIAngel","homepage":"","size":3175,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":false,"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/jmazouri/CIAngel/pulls/1"},"html":{"href":"https://github.com/jmazouri/CIAngel/pull/1"},"issue":{"href":"https://api.github.com/repos/jmazouri/CIAngel/issues/1"},"comments":{"href":"https://api.github.com/repos/jmazouri/CIAngel/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/jmazouri/CIAngel/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/jmazouri/CIAngel/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jmazouri/CIAngel/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/jmazouri/CIAngel/statuses/57f744927b8a6a615df015623fa4e6ffece1e2db"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"jmazouri","id":1239222,"avatar_url":"https://avatars.githubusercontent.com/u/1239222?v=3","gravatar_id":"","url":"https://api.github.com/users/jmazouri","html_url":"https://github.com/jmazouri","followers_url":"https://api.github.com/users/jmazouri/followers","following_url":"https://api.github.com/users/jmazouri/following{/other_user}","gists_url":"https://api.github.com/users/jmazouri/gists{/gist_id}","starred_url":"https://api.github.com/users/jmazouri/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmazouri/subscriptions","organizations_url":"https://api.github.com/users/jmazouri/orgs","repos_url":"https://api.github.com/users/jmazouri/repos","events_url":"https://api.github.com/users/jmazouri/events{/privacy}","received_events_url":"https://api.github.com/users/jmazouri/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":1,"additions":48,"deletions":23,"changed_files":1}}