{"action":"created","comment":{"url":"https://api.github.com/repos/oppia/oppia/pulls/comments/215325656","pull_request_review_id":152564125,"id":215325656,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIxNTMyNTY1Ng==","diff_hunk":"@@ -92,6 +92,14 @@\n         'message': 'Please make sure all files only have LF endings (no CRLF).',\n         'excluded_files': (),\n         'excluded_dirs': ()},\n+    '<<<<<<<': {\n+        'message': 'Please remove Git conflict markers completely. ',","path":"scripts/pre_commit_linter.py","position":null,"original_position":5,"commit_id":"b82666cb85bdb9b641c1780476b7f85a02cfb9d9","original_commit_id":"7e51363d43d33dea5ed9e16c9cb6c32f01c0ab42","user":{"login":"apb7","id":24826041,"node_id":"MDQ6VXNlcjI0ODI2MDQx","avatar_url":"https://avatars2.githubusercontent.com/u/24826041?v=4","gravatar_id":"","url":"https://api.github.com/users/apb7","html_url":"https://github.com/apb7","followers_url":"https://api.github.com/users/apb7/followers","following_url":"https://api.github.com/users/apb7/following{/other_user}","gists_url":"https://api.github.com/users/apb7/gists{/gist_id}","starred_url":"https://api.github.com/users/apb7/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apb7/subscriptions","organizations_url":"https://api.github.com/users/apb7/orgs","repos_url":"https://api.github.com/users/apb7/repos","events_url":"https://api.github.com/users/apb7/events{/privacy}","received_events_url":"https://api.github.com/users/apb7/received_events","type":"User","site_admin":false},"body":"I agree. Changed as suggested! Thanks!","created_at":"2018-09-05T15:46:49Z","updated_at":"2018-09-05T15:46:50Z","html_url":"https://github.com/oppia/oppia/pull/5624#discussion_r215325656","pull_request_url":"https://api.github.com/repos/oppia/oppia/pulls/5624","author_association":"MEMBER","_links":{"self":{"href":"https://api.github.com/repos/oppia/oppia/pulls/comments/215325656"},"html":{"href":"https://github.com/oppia/oppia/pull/5624#discussion_r215325656"},"pull_request":{"href":"https://api.github.com/repos/oppia/oppia/pulls/5624"}},"in_reply_to_id":215163301},"pull_request":{"url":"https://api.github.com/repos/oppia/oppia/pulls/5624","id":212954503,"node_id":"MDExOlB1bGxSZXF1ZXN0MjEyOTU0NTAz","html_url":"https://github.com/oppia/oppia/pull/5624","diff_url":"https://github.com/oppia/oppia/pull/5624.diff","patch_url":"https://github.com/oppia/oppia/pull/5624.patch","issue_url":"https://api.github.com/repos/oppia/oppia/issues/5624","number":5624,"state":"open","locked":false,"title":"Fix #5620: Add check for git conflict markers","user":{"login":"apb7","id":24826041,"node_id":"MDQ6VXNlcjI0ODI2MDQx","avatar_url":"https://avatars2.githubusercontent.com/u/24826041?v=4","gravatar_id":"","url":"https://api.github.com/users/apb7","html_url":"https://github.com/apb7","followers_url":"https://api.github.com/users/apb7/followers","following_url":"https://api.github.com/users/apb7/following{/other_user}","gists_url":"https://api.github.com/users/apb7/gists{/gist_id}","starred_url":"https://api.github.com/users/apb7/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apb7/subscriptions","organizations_url":"https://api.github.com/users/apb7/orgs","repos_url":"https://api.github.com/users/apb7/repos","events_url":"https://api.github.com/users/apb7/events{/privacy}","received_events_url":"https://api.github.com/users/apb7/received_events","type":"User","site_admin":false},"body":"<!--\r\n  - Thanks for submitting code to Oppia! Please fill out the following as part of\r\n  - your pull request so we can review your code more easily.\r\n  -->\r\n## Explanation\r\n<!--\r\n  - Explain what your PR does. If this PR fixes an existing bug, please include \r\n  - \"Fixes #bugnum:\" in the explanation so that GitHub can auto-close the issue \r\n  - when this PR is merged.\r\n  -->\r\nFixes #5620 \r\n\r\n## Checklist\r\n- [X] The PR title starts with \"Fix #bugnum: \", followed by a short, clear summary of the changes.\r\n- [X] The PR explanation includes the words \"Fixes #bugnum: ...\".\r\n- [X] The linter/Karma presubmit checks have passed.\r\n  - These should run automatically, but if not, you can manually trigger them locally using `python scripts/pre_commit_linter.py` and `bash scripts/run_frontend_tests.sh`.\r\n- [X] The PR is made from a branch that's **not** called \"develop\".\r\n- [X] The PR follows the [style guide](https://github.com/oppia/oppia/wiki/Coding-style-guide).\r\n- [X] The PR is assigned to an appropriate reviewer.\r\n  - If you're a new contributor, please ask on [Gitter](https://gitter.im/oppia/oppia-chat) for someone to assign a reviewer.\r\n  - If you're not sure who the appropriate reviewer is, please assign to the issue's \"owner\" -- see the \"talk-to\" label on the issue.\r\n","created_at":"2018-09-04T12:12:41Z","updated_at":"2018-09-05T15:46:50Z","closed_at":null,"merged_at":null,"merge_commit_sha":"bb5451c298450601e356a21b8326f451c84cb14d","assignee":{"login":"seanlip","id":10575562,"node_id":"MDQ6VXNlcjEwNTc1NTYy","avatar_url":"https://avatars0.githubusercontent.com/u/10575562?v=4","gravatar_id":"","url":"https://api.github.com/users/seanlip","html_url":"https://github.com/seanlip","followers_url":"https://api.github.com/users/seanlip/followers","following_url":"https://api.github.com/users/seanlip/following{/other_user}","gists_url":"https://api.github.com/users/seanlip/gists{/gist_id}","starred_url":"https://api.github.com/users/seanlip/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seanlip/subscriptions","organizations_url":"https://api.github.com/users/seanlip/orgs","repos_url":"https://api.github.com/users/seanlip/repos","events_url":"https://api.github.com/users/seanlip/events{/privacy}","received_events_url":"https://api.github.com/users/seanlip/received_events","type":"User","site_admin":false},"assignees":[{"login":"seanlip","id":10575562,"node_id":"MDQ6VXNlcjEwNTc1NTYy","avatar_url":"https://avatars0.githubusercontent.com/u/10575562?v=4","gravatar_id":"","url":"https://api.github.com/users/seanlip","html_url":"https://github.com/seanlip","followers_url":"https://api.github.com/users/seanlip/followers","following_url":"https://api.github.com/users/seanlip/following{/other_user}","gists_url":"https://api.github.com/users/seanlip/gists{/gist_id}","starred_url":"https://api.github.com/users/seanlip/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seanlip/subscriptions","organizations_url":"https://api.github.com/users/seanlip/orgs","repos_url":"https://api.github.com/users/seanlip/repos","events_url":"https://api.github.com/users/seanlip/events{/privacy}","received_events_url":"https://api.github.com/users/seanlip/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/oppia/oppia/pulls/5624/commits","review_comments_url":"https://api.github.com/repos/oppia/oppia/pulls/5624/comments","review_comment_url":"https://api.github.com/repos/oppia/oppia/pulls/comments{/number}","comments_url":"https://api.github.com/repos/oppia/oppia/issues/5624/comments","statuses_url":"https://api.github.com/repos/oppia/oppia/statuses/b82666cb85bdb9b641c1780476b7f85a02cfb9d9","head":{"label":"apb7:fix-5620","ref":"fix-5620","sha":"b82666cb85bdb9b641c1780476b7f85a02cfb9d9","user":{"login":"apb7","id":24826041,"node_id":"MDQ6VXNlcjI0ODI2MDQx","avatar_url":"https://avatars2.githubusercontent.com/u/24826041?v=4","gravatar_id":"","url":"https://api.github.com/users/apb7","html_url":"https://github.com/apb7","followers_url":"https://api.github.com/users/apb7/followers","following_url":"https://api.github.com/users/apb7/following{/other_user}","gists_url":"https://api.github.com/users/apb7/gists{/gist_id}","starred_url":"https://api.github.com/users/apb7/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apb7/subscriptions","organizations_url":"https://api.github.com/users/apb7/orgs","repos_url":"https://api.github.com/users/apb7/repos","events_url":"https://api.github.com/users/apb7/events{/privacy}","received_events_url":"https://api.github.com/users/apb7/received_events","type":"User","site_admin":false},"repo":{"id":139143157,"node_id":"MDEwOlJlcG9zaXRvcnkxMzkxNDMxNTc=","name":"oppia","full_name":"apb7/oppia","owner":{"login":"apb7","id":24826041,"node_id":"MDQ6VXNlcjI0ODI2MDQx","avatar_url":"https://avatars2.githubusercontent.com/u/24826041?v=4","gravatar_id":"","url":"https://api.github.com/users/apb7","html_url":"https://github.com/apb7","followers_url":"https://api.github.com/users/apb7/followers","following_url":"https://api.github.com/users/apb7/following{/other_user}","gists_url":"https://api.github.com/users/apb7/gists{/gist_id}","starred_url":"https://api.github.com/users/apb7/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apb7/subscriptions","organizations_url":"https://api.github.com/users/apb7/orgs","repos_url":"https://api.github.com/users/apb7/repos","events_url":"https://api.github.com/users/apb7/events{/privacy}","received_events_url":"https://api.github.com/users/apb7/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/apb7/oppia","description":"Tool for collaboratively building interactive lessons.","fork":true,"url":"https://api.github.com/repos/apb7/oppia","forks_url":"https://api.github.com/repos/apb7/oppia/forks","keys_url":"https://api.github.com/repos/apb7/oppia/keys{/key_id}","collaborators_url":"https://api.github.com/repos/apb7/oppia/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/apb7/oppia/teams","hooks_url":"https://api.github.com/repos/apb7/oppia/hooks","issue_events_url":"https://api.github.com/repos/apb7/oppia/issues/events{/number}","events_url":"https://api.github.com/repos/apb7/oppia/events","assignees_url":"https://api.github.com/repos/apb7/oppia/assignees{/user}","branches_url":"https://api.github.com/repos/apb7/oppia/branches{/branch}","tags_url":"https://api.github.com/repos/apb7/oppia/tags","blobs_url":"https://api.github.com/repos/apb7/oppia/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/apb7/oppia/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/apb7/oppia/git/refs{/sha}","trees_url":"https://api.github.com/repos/apb7/oppia/git/trees{/sha}","statuses_url":"https://api.github.com/repos/apb7/oppia/statuses/{sha}","languages_url":"https://api.github.com/repos/apb7/oppia/languages","stargazers_url":"https://api.github.com/repos/apb7/oppia/stargazers","contributors_url":"https://api.github.com/repos/apb7/oppia/contributors","subscribers_url":"https://api.github.com/repos/apb7/oppia/subscribers","subscription_url":"https://api.github.com/repos/apb7/oppia/subscription","commits_url":"https://api.github.com/repos/apb7/oppia/commits{/sha}","git_commits_url":"https://api.github.com/repos/apb7/oppia/git/commits{/sha}","comments_url":"https://api.github.com/repos/apb7/oppia/comments{/number}","issue_comment_url":"https://api.github.com/repos/apb7/oppia/issues/comments{/number}","contents_url":"https://api.github.com/repos/apb7/oppia/contents/{+path}","compare_url":"https://api.github.com/repos/apb7/oppia/compare/{base}...{head}","merges_url":"https://api.github.com/repos/apb7/oppia/merges","archive_url":"https://api.github.com/repos/apb7/oppia/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/apb7/oppia/downloads","issues_url":"https://api.github.com/repos/apb7/oppia/issues{/number}","pulls_url":"https://api.github.com/repos/apb7/oppia/pulls{/number}","milestones_url":"https://api.github.com/repos/apb7/oppia/milestones{/number}","notifications_url":"https://api.github.com/repos/apb7/oppia/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/apb7/oppia/labels{/name}","releases_url":"https://api.github.com/repos/apb7/oppia/releases{/id}","deployments_url":"https://api.github.com/repos/apb7/oppia/deployments","created_at":"2018-06-29T11:48:59Z","updated_at":"2018-06-29T11:49:06Z","pushed_at":"2018-09-05T15:46:02Z","git_url":"git://github.com/apb7/oppia.git","ssh_url":"git@github.com:apb7/oppia.git","clone_url":"https://github.com/apb7/oppia.git","svn_url":"https://github.com/apb7/oppia","homepage":"https://www.oppia.org","size":107110,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_projects":true,"has_downloads":false,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"oppia:develop","ref":"develop","sha":"3c9dcf86b6c3d5700c249dd8c14b6c6b925b706b","user":{"login":"oppia","id":11620230,"node_id":"MDEyOk9yZ2FuaXphdGlvbjExNjIwMjMw","avatar_url":"https://avatars1.githubusercontent.com/u/11620230?v=4","gravatar_id":"","url":"https://api.github.com/users/oppia","html_url":"https://github.com/oppia","followers_url":"https://api.github.com/users/oppia/followers","following_url":"https://api.github.com/users/oppia/following{/other_user}","gists_url":"https://api.github.com/users/oppia/gists{/gist_id}","starred_url":"https://api.github.com/users/oppia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oppia/subscriptions","organizations_url":"https://api.github.com/users/oppia/orgs","repos_url":"https://api.github.com/users/oppia/repos","events_url":"https://api.github.com/users/oppia/events{/privacy}","received_events_url":"https://api.github.com/users/oppia/received_events","type":"Organization","site_admin":false},"repo":{"id":40687563,"node_id":"MDEwOlJlcG9zaXRvcnk0MDY4NzU2Mw==","name":"oppia","full_name":"oppia/oppia","owner":{"login":"oppia","id":11620230,"node_id":"MDEyOk9yZ2FuaXphdGlvbjExNjIwMjMw","avatar_url":"https://avatars1.githubusercontent.com/u/11620230?v=4","gravatar_id":"","url":"https://api.github.com/users/oppia","html_url":"https://github.com/oppia","followers_url":"https://api.github.com/users/oppia/followers","following_url":"https://api.github.com/users/oppia/following{/other_user}","gists_url":"https://api.github.com/users/oppia/gists{/gist_id}","starred_url":"https://api.github.com/users/oppia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oppia/subscriptions","organizations_url":"https://api.github.com/users/oppia/orgs","repos_url":"https://api.github.com/users/oppia/repos","events_url":"https://api.github.com/users/oppia/events{/privacy}","received_events_url":"https://api.github.com/users/oppia/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/oppia/oppia","description":"Tool for collaboratively building interactive lessons.","fork":false,"url":"https://api.github.com/repos/oppia/oppia","forks_url":"https://api.github.com/repos/oppia/oppia/forks","keys_url":"https://api.github.com/repos/oppia/oppia/keys{/key_id}","collaborators_url":"https://api.github.com/repos/oppia/oppia/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/oppia/oppia/teams","hooks_url":"https://api.github.com/repos/oppia/oppia/hooks","issue_events_url":"https://api.github.com/repos/oppia/oppia/issues/events{/number}","events_url":"https://api.github.com/repos/oppia/oppia/events","assignees_url":"https://api.github.com/repos/oppia/oppia/assignees{/user}","branches_url":"https://api.github.com/repos/oppia/oppia/branches{/branch}","tags_url":"https://api.github.com/repos/oppia/oppia/tags","blobs_url":"https://api.github.com/repos/oppia/oppia/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/oppia/oppia/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/oppia/oppia/git/refs{/sha}","trees_url":"https://api.github.com/repos/oppia/oppia/git/trees{/sha}","statuses_url":"https://api.github.com/repos/oppia/oppia/statuses/{sha}","languages_url":"https://api.github.com/repos/oppia/oppia/languages","stargazers_url":"https://api.github.com/repos/oppia/oppia/stargazers","contributors_url":"https://api.github.com/repos/oppia/oppia/contributors","subscribers_url":"https://api.github.com/repos/oppia/oppia/subscribers","subscription_url":"https://api.github.com/repos/oppia/oppia/subscription","commits_url":"https://api.github.com/repos/oppia/oppia/commits{/sha}","git_commits_url":"https://api.github.com/repos/oppia/oppia/git/commits{/sha}","comments_url":"https://api.github.com/repos/oppia/oppia/comments{/number}","issue_comment_url":"https://api.github.com/repos/oppia/oppia/issues/comments{/number}","contents_url":"https://api.github.com/repos/oppia/oppia/contents/{+path}","compare_url":"https://api.github.com/repos/oppia/oppia/compare/{base}...{head}","merges_url":"https://api.github.com/repos/oppia/oppia/merges","archive_url":"https://api.github.com/repos/oppia/oppia/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/oppia/oppia/downloads","issues_url":"https://api.github.com/repos/oppia/oppia/issues{/number}","pulls_url":"https://api.github.com/repos/oppia/oppia/pulls{/number}","milestones_url":"https://api.github.com/repos/oppia/oppia/milestones{/number}","notifications_url":"https://api.github.com/repos/oppia/oppia/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/oppia/oppia/labels{/name}","releases_url":"https://api.github.com/repos/oppia/oppia/releases{/id}","deployments_url":"https://api.github.com/repos/oppia/oppia/deployments","created_at":"2015-08-14T00:16:14Z","updated_at":"2018-09-05T07:15:18Z","pushed_at":"2018-09-05T15:46:04Z","git_url":"git://github.com/oppia/oppia.git","ssh_url":"git@github.com:oppia/oppia.git","clone_url":"https://github.com/oppia/oppia.git","svn_url":"https://github.com/oppia/oppia","homepage":"https://www.oppia.org","size":107190,"stargazers_count":725,"watchers_count":725,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":false,"has_wiki":true,"has_pages":false,"forks_count":693,"mirror_url":null,"archived":false,"open_issues_count":359,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":693,"open_issues":359,"watchers":725,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/oppia/oppia/pulls/5624"},"html":{"href":"https://github.com/oppia/oppia/pull/5624"},"issue":{"href":"https://api.github.com/repos/oppia/oppia/issues/5624"},"comments":{"href":"https://api.github.com/repos/oppia/oppia/issues/5624/comments"},"review_comments":{"href":"https://api.github.com/repos/oppia/oppia/pulls/5624/comments"},"review_comment":{"href":"https://api.github.com/repos/oppia/oppia/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/oppia/oppia/pulls/5624/commits"},"statuses":{"href":"https://api.github.com/repos/oppia/oppia/statuses/b82666cb85bdb9b641c1780476b7f85a02cfb9d9"}},"author_association":"MEMBER"}}
{"actor":{"display_login":"apb7"}}