{"action":"closed","number":38,"pull_request":{"url":"https://api.github.com/repos/letmecheck/app/pulls/38","id":71448603,"html_url":"https://github.com/letmecheck/app/pull/38","diff_url":"https://github.com/letmecheck/app/pull/38.diff","patch_url":"https://github.com/letmecheck/app/pull/38.patch","issue_url":"https://api.github.com/repos/letmecheck/app/issues/38","number":38,"state":"closed","locked":false,"title":"Fix unresolved merge conflict to eliminate error when running Rubocop","user":{"login":"steve-mcclellan","id":17390227,"avatar_url":"https://avatars.githubusercontent.com/u/17390227?v=3","gravatar_id":"","url":"https://api.github.com/users/steve-mcclellan","html_url":"https://github.com/steve-mcclellan","followers_url":"https://api.github.com/users/steve-mcclellan/followers","following_url":"https://api.github.com/users/steve-mcclellan/following{/other_user}","gists_url":"https://api.github.com/users/steve-mcclellan/gists{/gist_id}","starred_url":"https://api.github.com/users/steve-mcclellan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/steve-mcclellan/subscriptions","organizations_url":"https://api.github.com/users/steve-mcclellan/orgs","repos_url":"https://api.github.com/users/steve-mcclellan/repos","events_url":"https://api.github.com/users/steve-mcclellan/events{/privacy}","received_events_url":"https://api.github.com/users/steve-mcclellan/received_events","type":"User","site_admin":false},"body":"The version of .rubocop.yml in master had merge-conflict symbols still in it, which caused an error to be thrown upon running Rubocop. This branch removes those symbols and the duplicate code, keeping the additions made in both previous commits. (Now, Rubocop is back to complaining about tabs in the games controller. Progress!)","created_at":"2016-05-25T19:25:32Z","updated_at":"2016-05-25T19:35:56Z","closed_at":"2016-05-25T19:35:56Z","merged_at":"2016-05-25T19:35:56Z","merge_commit_sha":"0ba53374d041078abfc1ba4c2d5edf1e97694042","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/letmecheck/app/pulls/38/commits","review_comments_url":"https://api.github.com/repos/letmecheck/app/pulls/38/comments","review_comment_url":"https://api.github.com/repos/letmecheck/app/pulls/comments{/number}","comments_url":"https://api.github.com/repos/letmecheck/app/issues/38/comments","statuses_url":"https://api.github.com/repos/letmecheck/app/statuses/80a76366d7785ff12d8a3b37149f4b68d7f4ce1c","head":{"label":"letmecheck:fix-rubocop-yml","ref":"fix-rubocop-yml","sha":"80a76366d7785ff12d8a3b37149f4b68d7f4ce1c","user":{"login":"letmecheck","id":19283809,"avatar_url":"https://avatars.githubusercontent.com/u/19283809?v=3","gravatar_id":"","url":"https://api.github.com/users/letmecheck","html_url":"https://github.com/letmecheck","followers_url":"https://api.github.com/users/letmecheck/followers","following_url":"https://api.github.com/users/letmecheck/following{/other_user}","gists_url":"https://api.github.com/users/letmecheck/gists{/gist_id}","starred_url":"https://api.github.com/users/letmecheck/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/letmecheck/subscriptions","organizations_url":"https://api.github.com/users/letmecheck/orgs","repos_url":"https://api.github.com/users/letmecheck/repos","events_url":"https://api.github.com/users/letmecheck/events{/privacy}","received_events_url":"https://api.github.com/users/letmecheck/received_events","type":"Organization","site_admin":false},"repo":{"id":58450139,"name":"app","full_name":"letmecheck/app","owner":{"login":"letmecheck","id":19283809,"avatar_url":"https://avatars.githubusercontent.com/u/19283809?v=3","gravatar_id":"","url":"https://api.github.com/users/letmecheck","html_url":"https://github.com/letmecheck","followers_url":"https://api.github.com/users/letmecheck/followers","following_url":"https://api.github.com/users/letmecheck/following{/other_user}","gists_url":"https://api.github.com/users/letmecheck/gists{/gist_id}","starred_url":"https://api.github.com/users/letmecheck/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/letmecheck/subscriptions","organizations_url":"https://api.github.com/users/letmecheck/orgs","repos_url":"https://api.github.com/users/letmecheck/repos","events_url":"https://api.github.com/users/letmecheck/events{/privacy}","received_events_url":"https://api.github.com/users/letmecheck/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/letmecheck/app","description":"","fork":false,"url":"https://api.github.com/repos/letmecheck/app","forks_url":"https://api.github.com/repos/letmecheck/app/forks","keys_url":"https://api.github.com/repos/letmecheck/app/keys{/key_id}","collaborators_url":"https://api.github.com/repos/letmecheck/app/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/letmecheck/app/teams","hooks_url":"https://api.github.com/repos/letmecheck/app/hooks","issue_events_url":"https://api.github.com/repos/letmecheck/app/issues/events{/number}","events_url":"https://api.github.com/repos/letmecheck/app/events","assignees_url":"https://api.github.com/repos/letmecheck/app/assignees{/user}","branches_url":"https://api.github.com/repos/letmecheck/app/branches{/branch}","tags_url":"https://api.github.com/repos/letmecheck/app/tags","blobs_url":"https://api.github.com/repos/letmecheck/app/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/letmecheck/app/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/letmecheck/app/git/refs{/sha}","trees_url":"https://api.github.com/repos/letmecheck/app/git/trees{/sha}","statuses_url":"https://api.github.com/repos/letmecheck/app/statuses/{sha}","languages_url":"https://api.github.com/repos/letmecheck/app/languages","stargazers_url":"https://api.github.com/repos/letmecheck/app/stargazers","contributors_url":"https://api.github.com/repos/letmecheck/app/contributors","subscribers_url":"https://api.github.com/repos/letmecheck/app/subscribers","subscription_url":"https://api.github.com/repos/letmecheck/app/subscription","commits_url":"https://api.github.com/repos/letmecheck/app/commits{/sha}","git_commits_url":"https://api.github.com/repos/letmecheck/app/git/commits{/sha}","comments_url":"https://api.github.com/repos/letmecheck/app/comments{/number}","issue_comment_url":"https://api.github.com/repos/letmecheck/app/issues/comments{/number}","contents_url":"https://api.github.com/repos/letmecheck/app/contents/{+path}","compare_url":"https://api.github.com/repos/letmecheck/app/compare/{base}...{head}","merges_url":"https://api.github.com/repos/letmecheck/app/merges","archive_url":"https://api.github.com/repos/letmecheck/app/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/letmecheck/app/downloads","issues_url":"https://api.github.com/repos/letmecheck/app/issues{/number}","pulls_url":"https://api.github.com/repos/letmecheck/app/pulls{/number}","milestones_url":"https://api.github.com/repos/letmecheck/app/milestones{/number}","notifications_url":"https://api.github.com/repos/letmecheck/app/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/letmecheck/app/labels{/name}","releases_url":"https://api.github.com/repos/letmecheck/app/releases{/id}","deployments_url":"https://api.github.com/repos/letmecheck/app/deployments","created_at":"2016-05-10T10:00:07Z","updated_at":"2016-05-10T10:12:42Z","pushed_at":"2016-05-25T19:35:56Z","git_url":"git://github.com/letmecheck/app.git","ssh_url":"git@github.com:letmecheck/app.git","clone_url":"https://github.com/letmecheck/app.git","svn_url":"https://github.com/letmecheck/app","homepage":null,"size":260,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":1,"forks":1,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"letmecheck:master","ref":"master","sha":"97763448b3aa2ee83b35d69f112b052160106902","user":{"login":"letmecheck","id":19283809,"avatar_url":"https://avatars.githubusercontent.com/u/19283809?v=3","gravatar_id":"","url":"https://api.github.com/users/letmecheck","html_url":"https://github.com/letmecheck","followers_url":"https://api.github.com/users/letmecheck/followers","following_url":"https://api.github.com/users/letmecheck/following{/other_user}","gists_url":"https://api.github.com/users/letmecheck/gists{/gist_id}","starred_url":"https://api.github.com/users/letmecheck/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/letmecheck/subscriptions","organizations_url":"https://api.github.com/users/letmecheck/orgs","repos_url":"https://api.github.com/users/letmecheck/repos","events_url":"https://api.github.com/users/letmecheck/events{/privacy}","received_events_url":"https://api.github.com/users/letmecheck/received_events","type":"Organization","site_admin":false},"repo":{"id":58450139,"name":"app","full_name":"letmecheck/app","owner":{"login":"letmecheck","id":19283809,"avatar_url":"https://avatars.githubusercontent.com/u/19283809?v=3","gravatar_id":"","url":"https://api.github.com/users/letmecheck","html_url":"https://github.com/letmecheck","followers_url":"https://api.github.com/users/letmecheck/followers","following_url":"https://api.github.com/users/letmecheck/following{/other_user}","gists_url":"https://api.github.com/users/letmecheck/gists{/gist_id}","starred_url":"https://api.github.com/users/letmecheck/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/letmecheck/subscriptions","organizations_url":"https://api.github.com/users/letmecheck/orgs","repos_url":"https://api.github.com/users/letmecheck/repos","events_url":"https://api.github.com/users/letmecheck/events{/privacy}","received_events_url":"https://api.github.com/users/letmecheck/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/letmecheck/app","description":"","fork":false,"url":"https://api.github.com/repos/letmecheck/app","forks_url":"https://api.github.com/repos/letmecheck/app/forks","keys_url":"https://api.github.com/repos/letmecheck/app/keys{/key_id}","collaborators_url":"https://api.github.com/repos/letmecheck/app/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/letmecheck/app/teams","hooks_url":"https://api.github.com/repos/letmecheck/app/hooks","issue_events_url":"https://api.github.com/repos/letmecheck/app/issues/events{/number}","events_url":"https://api.github.com/repos/letmecheck/app/events","assignees_url":"https://api.github.com/repos/letmecheck/app/assignees{/user}","branches_url":"https://api.github.com/repos/letmecheck/app/branches{/branch}","tags_url":"https://api.github.com/repos/letmecheck/app/tags","blobs_url":"https://api.github.com/repos/letmecheck/app/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/letmecheck/app/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/letmecheck/app/git/refs{/sha}","trees_url":"https://api.github.com/repos/letmecheck/app/git/trees{/sha}","statuses_url":"https://api.github.com/repos/letmecheck/app/statuses/{sha}","languages_url":"https://api.github.com/repos/letmecheck/app/languages","stargazers_url":"https://api.github.com/repos/letmecheck/app/stargazers","contributors_url":"https://api.github.com/repos/letmecheck/app/contributors","subscribers_url":"https://api.github.com/repos/letmecheck/app/subscribers","subscription_url":"https://api.github.com/repos/letmecheck/app/subscription","commits_url":"https://api.github.com/repos/letmecheck/app/commits{/sha}","git_commits_url":"https://api.github.com/repos/letmecheck/app/git/commits{/sha}","comments_url":"https://api.github.com/repos/letmecheck/app/comments{/number}","issue_comment_url":"https://api.github.com/repos/letmecheck/app/issues/comments{/number}","contents_url":"https://api.github.com/repos/letmecheck/app/contents/{+path}","compare_url":"https://api.github.com/repos/letmecheck/app/compare/{base}...{head}","merges_url":"https://api.github.com/repos/letmecheck/app/merges","archive_url":"https://api.github.com/repos/letmecheck/app/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/letmecheck/app/downloads","issues_url":"https://api.github.com/repos/letmecheck/app/issues{/number}","pulls_url":"https://api.github.com/repos/letmecheck/app/pulls{/number}","milestones_url":"https://api.github.com/repos/letmecheck/app/milestones{/number}","notifications_url":"https://api.github.com/repos/letmecheck/app/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/letmecheck/app/labels{/name}","releases_url":"https://api.github.com/repos/letmecheck/app/releases{/id}","deployments_url":"https://api.github.com/repos/letmecheck/app/deployments","created_at":"2016-05-10T10:00:07Z","updated_at":"2016-05-10T10:12:42Z","pushed_at":"2016-05-25T19:35:56Z","git_url":"git://github.com/letmecheck/app.git","ssh_url":"git@github.com:letmecheck/app.git","clone_url":"https://github.com/letmecheck/app.git","svn_url":"https://github.com/letmecheck/app","homepage":null,"size":260,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":1,"forks":1,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/letmecheck/app/pulls/38"},"html":{"href":"https://github.com/letmecheck/app/pull/38"},"issue":{"href":"https://api.github.com/repos/letmecheck/app/issues/38"},"comments":{"href":"https://api.github.com/repos/letmecheck/app/issues/38/comments"},"review_comments":{"href":"https://api.github.com/repos/letmecheck/app/pulls/38/comments"},"review_comment":{"href":"https://api.github.com/repos/letmecheck/app/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/letmecheck/app/pulls/38/commits"},"statuses":{"href":"https://api.github.com/repos/letmecheck/app/statuses/80a76366d7785ff12d8a3b37149f4b68d7f4ce1c"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"steve-mcclellan","id":17390227,"avatar_url":"https://avatars.githubusercontent.com/u/17390227?v=3","gravatar_id":"","url":"https://api.github.com/users/steve-mcclellan","html_url":"https://github.com/steve-mcclellan","followers_url":"https://api.github.com/users/steve-mcclellan/followers","following_url":"https://api.github.com/users/steve-mcclellan/following{/other_user}","gists_url":"https://api.github.com/users/steve-mcclellan/gists{/gist_id}","starred_url":"https://api.github.com/users/steve-mcclellan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/steve-mcclellan/subscriptions","organizations_url":"https://api.github.com/users/steve-mcclellan/orgs","repos_url":"https://api.github.com/users/steve-mcclellan/repos","events_url":"https://api.github.com/users/steve-mcclellan/events{/privacy}","received_events_url":"https://api.github.com/users/steve-mcclellan/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"commits":1,"additions":5,"deletions":17,"changed_files":1}}
{"actor":{"display_login":"steve-mcclellan"}}