{"action":"closed","number":2705,"pull_request":{"url":"https://api.github.com/repos/snipe/snipe-it/pulls/2705","id":87250415,"html_url":"https://github.com/snipe/snipe-it/pull/2705","diff_url":"https://github.com/snipe/snipe-it/pull/2705.diff","patch_url":"https://github.com/snipe/snipe-it/pull/2705.patch","issue_url":"https://api.github.com/repos/snipe/snipe-it/issues/2705","number":2705,"state":"closed","locked":false,"title":"Fix mismerged code.","user":{"login":"uberbrady","id":36335,"avatar_url":"https://avatars.githubusercontent.com/u/36335?v=3","gravatar_id":"","url":"https://api.github.com/users/uberbrady","html_url":"https://github.com/uberbrady","followers_url":"https://api.github.com/users/uberbrady/followers","following_url":"https://api.github.com/users/uberbrady/following{/other_user}","gists_url":"https://api.github.com/users/uberbrady/gists{/gist_id}","starred_url":"https://api.github.com/users/uberbrady/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/uberbrady/subscriptions","organizations_url":"https://api.github.com/users/uberbrady/orgs","repos_url":"https://api.github.com/users/uberbrady/repos","events_url":"https://api.github.com/users/uberbrady/events{/privacy}","received_events_url":"https://api.github.com/users/uberbrady/received_events","type":"User","site_admin":false},"body":"I managed to find a diff between the two states of the code, and was able to create a diff which I could then apply using `patch` back onto the `HEAD` of develop.\r\n\r\nI tried to clean out the silly stuff (whitespace changes) so you can see the real meat of the differences here.","created_at":"2016-09-29T05:55:13Z","updated_at":"2016-09-29T05:57:19Z","closed_at":"2016-09-29T05:57:19Z","merged_at":"2016-09-29T05:57:19Z","merge_commit_sha":"7ca7877740718e75a9c2a04dd93d18d8acbf82f9","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/snipe/snipe-it/pulls/2705/commits","review_comments_url":"https://api.github.com/repos/snipe/snipe-it/pulls/2705/comments","review_comment_url":"https://api.github.com/repos/snipe/snipe-it/pulls/comments{/number}","comments_url":"https://api.github.com/repos/snipe/snipe-it/issues/2705/comments","statuses_url":"https://api.github.com/repos/snipe/snipe-it/statuses/9d4f79d62059f40b7fcd225927ec28dc3c0b3c43","head":{"label":"snipe:fix-weird-merge","ref":"fix-weird-merge","sha":"9d4f79d62059f40b7fcd225927ec28dc3c0b3c43","user":{"login":"snipe","id":197404,"avatar_url":"https://avatars.githubusercontent.com/u/197404?v=3","gravatar_id":"","url":"https://api.github.com/users/snipe","html_url":"https://github.com/snipe","followers_url":"https://api.github.com/users/snipe/followers","following_url":"https://api.github.com/users/snipe/following{/other_user}","gists_url":"https://api.github.com/users/snipe/gists{/gist_id}","starred_url":"https://api.github.com/users/snipe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snipe/subscriptions","organizations_url":"https://api.github.com/users/snipe/orgs","repos_url":"https://api.github.com/users/snipe/repos","events_url":"https://api.github.com/users/snipe/events{/privacy}","received_events_url":"https://api.github.com/users/snipe/received_events","type":"User","site_admin":false},"repo":{"id":14346979,"name":"snipe-it","full_name":"snipe/snipe-it","owner":{"login":"snipe","id":197404,"avatar_url":"https://avatars.githubusercontent.com/u/197404?v=3","gravatar_id":"","url":"https://api.github.com/users/snipe","html_url":"https://github.com/snipe","followers_url":"https://api.github.com/users/snipe/followers","following_url":"https://api.github.com/users/snipe/following{/other_user}","gists_url":"https://api.github.com/users/snipe/gists{/gist_id}","starred_url":"https://api.github.com/users/snipe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snipe/subscriptions","organizations_url":"https://api.github.com/users/snipe/orgs","repos_url":"https://api.github.com/users/snipe/repos","events_url":"https://api.github.com/users/snipe/events{/privacy}","received_events_url":"https://api.github.com/users/snipe/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/snipe/snipe-it","description":"A free open source IT asset/license management system built in PHP on Laravel 5.2 and Bootstrap 3. ","fork":false,"url":"https://api.github.com/repos/snipe/snipe-it","forks_url":"https://api.github.com/repos/snipe/snipe-it/forks","keys_url":"https://api.github.com/repos/snipe/snipe-it/keys{/key_id}","collaborators_url":"https://api.github.com/repos/snipe/snipe-it/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/snipe/snipe-it/teams","hooks_url":"https://api.github.com/repos/snipe/snipe-it/hooks","issue_events_url":"https://api.github.com/repos/snipe/snipe-it/issues/events{/number}","events_url":"https://api.github.com/repos/snipe/snipe-it/events","assignees_url":"https://api.github.com/repos/snipe/snipe-it/assignees{/user}","branches_url":"https://api.github.com/repos/snipe/snipe-it/branches{/branch}","tags_url":"https://api.github.com/repos/snipe/snipe-it/tags","blobs_url":"https://api.github.com/repos/snipe/snipe-it/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/snipe/snipe-it/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/snipe/snipe-it/git/refs{/sha}","trees_url":"https://api.github.com/repos/snipe/snipe-it/git/trees{/sha}","statuses_url":"https://api.github.com/repos/snipe/snipe-it/statuses/{sha}","languages_url":"https://api.github.com/repos/snipe/snipe-it/languages","stargazers_url":"https://api.github.com/repos/snipe/snipe-it/stargazers","contributors_url":"https://api.github.com/repos/snipe/snipe-it/contributors","subscribers_url":"https://api.github.com/repos/snipe/snipe-it/subscribers","subscription_url":"https://api.github.com/repos/snipe/snipe-it/subscription","commits_url":"https://api.github.com/repos/snipe/snipe-it/commits{/sha}","git_commits_url":"https://api.github.com/repos/snipe/snipe-it/git/commits{/sha}","comments_url":"https://api.github.com/repos/snipe/snipe-it/comments{/number}","issue_comment_url":"https://api.github.com/repos/snipe/snipe-it/issues/comments{/number}","contents_url":"https://api.github.com/repos/snipe/snipe-it/contents/{+path}","compare_url":"https://api.github.com/repos/snipe/snipe-it/compare/{base}...{head}","merges_url":"https://api.github.com/repos/snipe/snipe-it/merges","archive_url":"https://api.github.com/repos/snipe/snipe-it/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/snipe/snipe-it/downloads","issues_url":"https://api.github.com/repos/snipe/snipe-it/issues{/number}","pulls_url":"https://api.github.com/repos/snipe/snipe-it/pulls{/number}","milestones_url":"https://api.github.com/repos/snipe/snipe-it/milestones{/number}","notifications_url":"https://api.github.com/repos/snipe/snipe-it/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/snipe/snipe-it/labels{/name}","releases_url":"https://api.github.com/repos/snipe/snipe-it/releases{/id}","deployments_url":"https://api.github.com/repos/snipe/snipe-it/deployments","created_at":"2013-11-12T22:25:47Z","updated_at":"2016-09-28T05:44:40Z","pushed_at":"2016-09-29T05:57:19Z","git_url":"git://github.com/snipe/snipe-it.git","ssh_url":"git@github.com:snipe/snipe-it.git","clone_url":"https://github.com/snipe/snipe-it.git","svn_url":"https://github.com/snipe/snipe-it","homepage":"https://snipeitapp.com","size":29363,"stargazers_count":924,"watchers_count":924,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":462,"mirror_url":null,"open_issues_count":452,"forks":462,"open_issues":452,"watchers":924,"default_branch":"master"}},"base":{"label":"snipe:develop","ref":"develop","sha":"139442476081b87f6b59543c04d110e1f7bbae9c","user":{"login":"snipe","id":197404,"avatar_url":"https://avatars.githubusercontent.com/u/197404?v=3","gravatar_id":"","url":"https://api.github.com/users/snipe","html_url":"https://github.com/snipe","followers_url":"https://api.github.com/users/snipe/followers","following_url":"https://api.github.com/users/snipe/following{/other_user}","gists_url":"https://api.github.com/users/snipe/gists{/gist_id}","starred_url":"https://api.github.com/users/snipe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snipe/subscriptions","organizations_url":"https://api.github.com/users/snipe/orgs","repos_url":"https://api.github.com/users/snipe/repos","events_url":"https://api.github.com/users/snipe/events{/privacy}","received_events_url":"https://api.github.com/users/snipe/received_events","type":"User","site_admin":false},"repo":{"id":14346979,"name":"snipe-it","full_name":"snipe/snipe-it","owner":{"login":"snipe","id":197404,"avatar_url":"https://avatars.githubusercontent.com/u/197404?v=3","gravatar_id":"","url":"https://api.github.com/users/snipe","html_url":"https://github.com/snipe","followers_url":"https://api.github.com/users/snipe/followers","following_url":"https://api.github.com/users/snipe/following{/other_user}","gists_url":"https://api.github.com/users/snipe/gists{/gist_id}","starred_url":"https://api.github.com/users/snipe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snipe/subscriptions","organizations_url":"https://api.github.com/users/snipe/orgs","repos_url":"https://api.github.com/users/snipe/repos","events_url":"https://api.github.com/users/snipe/events{/privacy}","received_events_url":"https://api.github.com/users/snipe/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/snipe/snipe-it","description":"A free open source IT asset/license management system built in PHP on Laravel 5.2 and Bootstrap 3. ","fork":false,"url":"https://api.github.com/repos/snipe/snipe-it","forks_url":"https://api.github.com/repos/snipe/snipe-it/forks","keys_url":"https://api.github.com/repos/snipe/snipe-it/keys{/key_id}","collaborators_url":"https://api.github.com/repos/snipe/snipe-it/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/snipe/snipe-it/teams","hooks_url":"https://api.github.com/repos/snipe/snipe-it/hooks","issue_events_url":"https://api.github.com/repos/snipe/snipe-it/issues/events{/number}","events_url":"https://api.github.com/repos/snipe/snipe-it/events","assignees_url":"https://api.github.com/repos/snipe/snipe-it/assignees{/user}","branches_url":"https://api.github.com/repos/snipe/snipe-it/branches{/branch}","tags_url":"https://api.github.com/repos/snipe/snipe-it/tags","blobs_url":"https://api.github.com/repos/snipe/snipe-it/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/snipe/snipe-it/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/snipe/snipe-it/git/refs{/sha}","trees_url":"https://api.github.com/repos/snipe/snipe-it/git/trees{/sha}","statuses_url":"https://api.github.com/repos/snipe/snipe-it/statuses/{sha}","languages_url":"https://api.github.com/repos/snipe/snipe-it/languages","stargazers_url":"https://api.github.com/repos/snipe/snipe-it/stargazers","contributors_url":"https://api.github.com/repos/snipe/snipe-it/contributors","subscribers_url":"https://api.github.com/repos/snipe/snipe-it/subscribers","subscription_url":"https://api.github.com/repos/snipe/snipe-it/subscription","commits_url":"https://api.github.com/repos/snipe/snipe-it/commits{/sha}","git_commits_url":"https://api.github.com/repos/snipe/snipe-it/git/commits{/sha}","comments_url":"https://api.github.com/repos/snipe/snipe-it/comments{/number}","issue_comment_url":"https://api.github.com/repos/snipe/snipe-it/issues/comments{/number}","contents_url":"https://api.github.com/repos/snipe/snipe-it/contents/{+path}","compare_url":"https://api.github.com/repos/snipe/snipe-it/compare/{base}...{head}","merges_url":"https://api.github.com/repos/snipe/snipe-it/merges","archive_url":"https://api.github.com/repos/snipe/snipe-it/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/snipe/snipe-it/downloads","issues_url":"https://api.github.com/repos/snipe/snipe-it/issues{/number}","pulls_url":"https://api.github.com/repos/snipe/snipe-it/pulls{/number}","milestones_url":"https://api.github.com/repos/snipe/snipe-it/milestones{/number}","notifications_url":"https://api.github.com/repos/snipe/snipe-it/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/snipe/snipe-it/labels{/name}","releases_url":"https://api.github.com/repos/snipe/snipe-it/releases{/id}","deployments_url":"https://api.github.com/repos/snipe/snipe-it/deployments","created_at":"2013-11-12T22:25:47Z","updated_at":"2016-09-28T05:44:40Z","pushed_at":"2016-09-29T05:57:19Z","git_url":"git://github.com/snipe/snipe-it.git","ssh_url":"git@github.com:snipe/snipe-it.git","clone_url":"https://github.com/snipe/snipe-it.git","svn_url":"https://github.com/snipe/snipe-it","homepage":"https://snipeitapp.com","size":29363,"stargazers_count":924,"watchers_count":924,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":462,"mirror_url":null,"open_issues_count":452,"forks":462,"open_issues":452,"watchers":924,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/snipe/snipe-it/pulls/2705"},"html":{"href":"https://github.com/snipe/snipe-it/pull/2705"},"issue":{"href":"https://api.github.com/repos/snipe/snipe-it/issues/2705"},"comments":{"href":"https://api.github.com/repos/snipe/snipe-it/issues/2705/comments"},"review_comments":{"href":"https://api.github.com/repos/snipe/snipe-it/pulls/2705/comments"},"review_comment":{"href":"https://api.github.com/repos/snipe/snipe-it/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/snipe/snipe-it/pulls/2705/commits"},"statuses":{"href":"https://api.github.com/repos/snipe/snipe-it/statuses/9d4f79d62059f40b7fcd225927ec28dc3c0b3c43"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"snipe","id":197404,"avatar_url":"https://avatars.githubusercontent.com/u/197404?v=3","gravatar_id":"","url":"https://api.github.com/users/snipe","html_url":"https://github.com/snipe","followers_url":"https://api.github.com/users/snipe/followers","following_url":"https://api.github.com/users/snipe/following{/other_user}","gists_url":"https://api.github.com/users/snipe/gists{/gist_id}","starred_url":"https://api.github.com/users/snipe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/snipe/subscriptions","organizations_url":"https://api.github.com/users/snipe/orgs","repos_url":"https://api.github.com/users/snipe/repos","events_url":"https://api.github.com/users/snipe/events{/privacy}","received_events_url":"https://api.github.com/users/snipe/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":1,"additions":128,"deletions":13,"changed_files":4}}
{"actor":{"display_login":"snipe"}}