{"action":"closed","number":34,"pull_request":{"url":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls/34","id":79606760,"html_url":"https://github.com/SalesforceFoundation/Relationships/pull/34","diff_url":"https://github.com/SalesforceFoundation/Relationships/pull/34.diff","patch_url":"https://github.com/SalesforceFoundation/Relationships/pull/34.patch","issue_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues/34","number":34,"state":"closed","locked":false,"title":"Merge conflict merging master into feature/jbury-japanese-translation","user":{"login":"jlantz","id":1697127,"avatar_url":"https://avatars.githubusercontent.com/u/1697127?v=3","gravatar_id":"","url":"https://api.github.com/users/jlantz","html_url":"https://github.com/jlantz","followers_url":"https://api.github.com/users/jlantz/followers","following_url":"https://api.github.com/users/jlantz/following{/other_user}","gists_url":"https://api.github.com/users/jlantz/gists{/gist_id}","starred_url":"https://api.github.com/users/jlantz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jlantz/subscriptions","organizations_url":"https://api.github.com/users/jlantz/orgs","repos_url":"https://api.github.com/users/jlantz/repos","events_url":"https://api.github.com/users/jlantz/events{/privacy}","received_events_url":"https://api.github.com/users/jlantz/received_events","type":"User","site_admin":false},"body":"mrbelvedere tried to merge new commits to master but hit a merge conflict.  Please resolve manually","created_at":"2016-08-01T17:42:27Z","updated_at":"2016-08-01T17:59:11Z","closed_at":"2016-08-01T17:59:11Z","merged_at":null,"merge_commit_sha":null,"assignee":{"login":"dospromptman","id":1058323,"avatar_url":"https://avatars.githubusercontent.com/u/1058323?v=3","gravatar_id":"","url":"https://api.github.com/users/dospromptman","html_url":"https://github.com/dospromptman","followers_url":"https://api.github.com/users/dospromptman/followers","following_url":"https://api.github.com/users/dospromptman/following{/other_user}","gists_url":"https://api.github.com/users/dospromptman/gists{/gist_id}","starred_url":"https://api.github.com/users/dospromptman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dospromptman/subscriptions","organizations_url":"https://api.github.com/users/dospromptman/orgs","repos_url":"https://api.github.com/users/dospromptman/repos","events_url":"https://api.github.com/users/dospromptman/events{/privacy}","received_events_url":"https://api.github.com/users/dospromptman/received_events","type":"User","site_admin":false},"assignees":[{"login":"dospromptman","id":1058323,"avatar_url":"https://avatars.githubusercontent.com/u/1058323?v=3","gravatar_id":"","url":"https://api.github.com/users/dospromptman","html_url":"https://github.com/dospromptman","followers_url":"https://api.github.com/users/dospromptman/followers","following_url":"https://api.github.com/users/dospromptman/following{/other_user}","gists_url":"https://api.github.com/users/dospromptman/gists{/gist_id}","starred_url":"https://api.github.com/users/dospromptman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dospromptman/subscriptions","organizations_url":"https://api.github.com/users/dospromptman/orgs","repos_url":"https://api.github.com/users/dospromptman/repos","events_url":"https://api.github.com/users/dospromptman/events{/privacy}","received_events_url":"https://api.github.com/users/dospromptman/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls/34/commits","review_comments_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls/34/comments","review_comment_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls/comments{/number}","comments_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues/34/comments","statuses_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/statuses/a25d623b8145f5ec2cb28e5cfc1e5c37aa98ee8d","head":{"label":"SalesforceFoundation:master","ref":"master","sha":"a25d623b8145f5ec2cb28e5cfc1e5c37aa98ee8d","user":{"login":"SalesforceFoundation","id":972305,"avatar_url":"https://avatars.githubusercontent.com/u/972305?v=3","gravatar_id":"","url":"https://api.github.com/users/SalesforceFoundation","html_url":"https://github.com/SalesforceFoundation","followers_url":"https://api.github.com/users/SalesforceFoundation/followers","following_url":"https://api.github.com/users/SalesforceFoundation/following{/other_user}","gists_url":"https://api.github.com/users/SalesforceFoundation/gists{/gist_id}","starred_url":"https://api.github.com/users/SalesforceFoundation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SalesforceFoundation/subscriptions","organizations_url":"https://api.github.com/users/SalesforceFoundation/orgs","repos_url":"https://api.github.com/users/SalesforceFoundation/repos","events_url":"https://api.github.com/users/SalesforceFoundation/events{/privacy}","received_events_url":"https://api.github.com/users/SalesforceFoundation/received_events","type":"Organization","site_admin":false},"repo":{"id":3102853,"name":"Relationships","full_name":"SalesforceFoundation/Relationships","owner":{"login":"SalesforceFoundation","id":972305,"avatar_url":"https://avatars.githubusercontent.com/u/972305?v=3","gravatar_id":"","url":"https://api.github.com/users/SalesforceFoundation","html_url":"https://github.com/SalesforceFoundation","followers_url":"https://api.github.com/users/SalesforceFoundation/followers","following_url":"https://api.github.com/users/SalesforceFoundation/following{/other_user}","gists_url":"https://api.github.com/users/SalesforceFoundation/gists{/gist_id}","starred_url":"https://api.github.com/users/SalesforceFoundation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SalesforceFoundation/subscriptions","organizations_url":"https://api.github.com/users/SalesforceFoundation/orgs","repos_url":"https://api.github.com/users/SalesforceFoundation/repos","events_url":"https://api.github.com/users/SalesforceFoundation/events{/privacy}","received_events_url":"https://api.github.com/users/SalesforceFoundation/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/SalesforceFoundation/Relationships","description":"Nonprofit Starter Pack Relationships Package","fork":false,"url":"https://api.github.com/repos/SalesforceFoundation/Relationships","forks_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/forks","keys_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/keys{/key_id}","collaborators_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/teams","hooks_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/hooks","issue_events_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues/events{/number}","events_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/events","assignees_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/assignees{/user}","branches_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/branches{/branch}","tags_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/tags","blobs_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/refs{/sha}","trees_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/trees{/sha}","statuses_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/statuses/{sha}","languages_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/languages","stargazers_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/stargazers","contributors_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/contributors","subscribers_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/subscribers","subscription_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/subscription","commits_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/commits{/sha}","git_commits_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/commits{/sha}","comments_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/comments{/number}","issue_comment_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues/comments{/number}","contents_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/contents/{+path}","compare_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/compare/{base}...{head}","merges_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/merges","archive_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/downloads","issues_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues{/number}","pulls_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls{/number}","milestones_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/milestones{/number}","notifications_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/labels{/name}","releases_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/releases{/id}","deployments_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/deployments","created_at":"2012-01-04T15:21:37Z","updated_at":"2015-12-12T05:53:43Z","pushed_at":"2016-08-01T17:42:27Z","git_url":"git://github.com/SalesforceFoundation/Relationships.git","ssh_url":"git@github.com:SalesforceFoundation/Relationships.git","clone_url":"https://github.com/SalesforceFoundation/Relationships.git","svn_url":"https://github.com/SalesforceFoundation/Relationships","homepage":"http://nonprofitstarterpack.org","size":4286,"stargazers_count":11,"watchers_count":11,"language":"Apex","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":10,"mirror_url":null,"open_issues_count":7,"forks":10,"open_issues":7,"watchers":11,"default_branch":"master"}},"base":{"label":"SalesforceFoundation:feature/jbury-japanese-translation","ref":"feature/jbury-japanese-translation","sha":"72cbc701e7a8638c9c1a27b0826bc75213cd3100","user":{"login":"SalesforceFoundation","id":972305,"avatar_url":"https://avatars.githubusercontent.com/u/972305?v=3","gravatar_id":"","url":"https://api.github.com/users/SalesforceFoundation","html_url":"https://github.com/SalesforceFoundation","followers_url":"https://api.github.com/users/SalesforceFoundation/followers","following_url":"https://api.github.com/users/SalesforceFoundation/following{/other_user}","gists_url":"https://api.github.com/users/SalesforceFoundation/gists{/gist_id}","starred_url":"https://api.github.com/users/SalesforceFoundation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SalesforceFoundation/subscriptions","organizations_url":"https://api.github.com/users/SalesforceFoundation/orgs","repos_url":"https://api.github.com/users/SalesforceFoundation/repos","events_url":"https://api.github.com/users/SalesforceFoundation/events{/privacy}","received_events_url":"https://api.github.com/users/SalesforceFoundation/received_events","type":"Organization","site_admin":false},"repo":{"id":3102853,"name":"Relationships","full_name":"SalesforceFoundation/Relationships","owner":{"login":"SalesforceFoundation","id":972305,"avatar_url":"https://avatars.githubusercontent.com/u/972305?v=3","gravatar_id":"","url":"https://api.github.com/users/SalesforceFoundation","html_url":"https://github.com/SalesforceFoundation","followers_url":"https://api.github.com/users/SalesforceFoundation/followers","following_url":"https://api.github.com/users/SalesforceFoundation/following{/other_user}","gists_url":"https://api.github.com/users/SalesforceFoundation/gists{/gist_id}","starred_url":"https://api.github.com/users/SalesforceFoundation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SalesforceFoundation/subscriptions","organizations_url":"https://api.github.com/users/SalesforceFoundation/orgs","repos_url":"https://api.github.com/users/SalesforceFoundation/repos","events_url":"https://api.github.com/users/SalesforceFoundation/events{/privacy}","received_events_url":"https://api.github.com/users/SalesforceFoundation/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/SalesforceFoundation/Relationships","description":"Nonprofit Starter Pack Relationships Package","fork":false,"url":"https://api.github.com/repos/SalesforceFoundation/Relationships","forks_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/forks","keys_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/keys{/key_id}","collaborators_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/teams","hooks_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/hooks","issue_events_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues/events{/number}","events_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/events","assignees_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/assignees{/user}","branches_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/branches{/branch}","tags_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/tags","blobs_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/refs{/sha}","trees_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/trees{/sha}","statuses_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/statuses/{sha}","languages_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/languages","stargazers_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/stargazers","contributors_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/contributors","subscribers_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/subscribers","subscription_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/subscription","commits_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/commits{/sha}","git_commits_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/git/commits{/sha}","comments_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/comments{/number}","issue_comment_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues/comments{/number}","contents_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/contents/{+path}","compare_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/compare/{base}...{head}","merges_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/merges","archive_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/downloads","issues_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues{/number}","pulls_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls{/number}","milestones_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/milestones{/number}","notifications_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/labels{/name}","releases_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/releases{/id}","deployments_url":"https://api.github.com/repos/SalesforceFoundation/Relationships/deployments","created_at":"2012-01-04T15:21:37Z","updated_at":"2015-12-12T05:53:43Z","pushed_at":"2016-08-01T17:42:27Z","git_url":"git://github.com/SalesforceFoundation/Relationships.git","ssh_url":"git@github.com:SalesforceFoundation/Relationships.git","clone_url":"https://github.com/SalesforceFoundation/Relationships.git","svn_url":"https://github.com/SalesforceFoundation/Relationships","homepage":"http://nonprofitstarterpack.org","size":4286,"stargazers_count":11,"watchers_count":11,"language":"Apex","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":10,"mirror_url":null,"open_issues_count":7,"forks":10,"open_issues":7,"watchers":11,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls/34"},"html":{"href":"https://github.com/SalesforceFoundation/Relationships/pull/34"},"issue":{"href":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues/34"},"comments":{"href":"https://api.github.com/repos/SalesforceFoundation/Relationships/issues/34/comments"},"review_comments":{"href":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls/34/comments"},"review_comment":{"href":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/SalesforceFoundation/Relationships/pulls/34/commits"},"statuses":{"href":"https://api.github.com/repos/SalesforceFoundation/Relationships/statuses/a25d623b8145f5ec2cb28e5cfc1e5c37aa98ee8d"}},"merged":false,"mergeable":false,"mergeable_state":"dirty","merged_by":null,"comments":0,"review_comments":0,"commits":8,"additions":1336,"deletions":0,"changed_files":22}}
{"actor":{"display_login":"dospromptman"}}