{"action":"created","comment":{"url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/comments/31382023","id":31382023,"diff_hunk":"@@ -154,97 +154,99 @@ <h1 class=\"page-header\">\n           <div class=\"col-sm-2 col-xs-4 thumb\">\n             <a class=\"contributor-thumb\" href=\"/contributors/vaidehi\">\n               <img class=\"thumbnail img-responsive\" src=\"/static/images/contributors/vaidehi.jpg\" />\n-              <span>Vaidehi Thete</span> \n+              <span>Vaidehi Thete</span>\n             </a>\n           </div>\n-          \n+\n           <div class=\"col-sm-2 col-xs-4 thumb\">\n             <a class=\"contributor-thumb\" href=\"/contributors/jason\">\n               <img class=\"thumbnail img-responsive\" src=\"/static/images/contributors/jason.jpg\" />\n-              <span>Jason Ou</span> \n+              <span>Jason Ou</span>\n             </a>\n           </div>\n-          \n+\n           <div class=\"col-sm-2 col-xs-4 thumb\">\n             <a class=\"contributor-thumb\" href=\"/contributors/lucamatsumoto\">\n               <img class=\"thumbnail img-responsive\" src=\"/static/images/contributors/lucamatsumoto.jpg\" />\n-              <span>Luca Matsumoto</span> \n+              <span>Luca Matsumoto</span>\n             </a>\n           </div>\n-    \n+\n           <div class=\"col-sm-2 col-xs-4 thumb\">\n             <a class=\"contributor-thumb\" href=\"/contributors/arcolife\">\n               <img class=\"thumbnail img-responsive\" src=\"/static/images/contributors/arcolife.png\" />\n-              <span>Archit Sharma</span> \n+              <span>Archit Sharma</span>\n             </a>\n           </div>\n-      \n+\n           <div class=\"col-sm-2 col-xs-4 thumb\">\n             <a class=\"contributor-thumb\" href=\"/contributors/AditiNath\">\n               <img class=\"thumbnail img-responsive\" src=\"/static/images/contributors/AditiNath.jpg\" />\n-              <span>Aditi Nath</span> \n+              <span>Aditi Nath</span>\n             </a>\n           </div>\n \n           <div class=\"col-sm-2 col-xs-4 thumb\">\n             <a class=\"contributor-thumb\" href=\"/contributors/ucerron\">\n               <img class=\"thumbnail img-responsive\" src=\"/static/images/contributors/ucerron.jpg\" />\n-              <span>Uwe Cerron</span> \n+              <span>Uwe Cerron</span>\n             </a>\n           </div>\n \n           <div class=\"col-sm-2 col-xs-4 thumb\">\n             <a class=\"contributor-thumb\" href=\"/contributors/KajalGupta\">\n               <img class=\"thumbnail img-responsive\" src=\"/static/images/contributors/KajalGupta.jpg\" />\n-              <span>Kajal Gupta</span> \n+              <span>Kajal Gupta</span>\n             </a>\n           </div>\n \n-      \n+\n           <div class=\"col-sm-2 col-xs-4 thumb\">\n             <a class=\"contributor-thumb\" href=\"/contributors/AmitRakesh\">\n               <img class=\"thumbnail img-responsive\" src=\"/static/images/contributors/AmitRakesh.jpg\" />\n-              <span>Amit Rakesh</span> \n+              <span>Amit Rakesh</span>\n             </a>\n           </div>\n+<<<<<<< HEAD","path":"staticfiles/templates/contributors/home.html","position":230,"original_position":230,"commit_id":"9f36d504eefec99da14ea3e864c53b0a3b62f0d7","original_commit_id":"9f36d504eefec99da14ea3e864c53b0a3b62f0d7","user":{"login":"MisterCruz","id":9670009,"avatar_url":"https://avatars.githubusercontent.com/u/9670009?v=3","gravatar_id":"","url":"https://api.github.com/users/MisterCruz","html_url":"https://github.com/MisterCruz","followers_url":"https://api.github.com/users/MisterCruz/followers","following_url":"https://api.github.com/users/MisterCruz/following{/other_user}","gists_url":"https://api.github.com/users/MisterCruz/gists{/gist_id}","starred_url":"https://api.github.com/users/MisterCruz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MisterCruz/subscriptions","organizations_url":"https://api.github.com/users/MisterCruz/orgs","repos_url":"https://api.github.com/users/MisterCruz/repos","events_url":"https://api.github.com/users/MisterCruz/events{/privacy}","received_events_url":"https://api.github.com/users/MisterCruz/received_events","type":"User","site_admin":false},"body":"How can I edit it? It won't let me from here, sorry!","created_at":"2015-05-30T16:11:31Z","updated_at":"2015-05-30T16:11:31Z","html_url":"https://github.com/crowdresearch/crowdsource-platform/pull/190#discussion_r31382023","pull_request_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/190","_links":{"self":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/comments/31382023"},"html":{"href":"https://github.com/crowdresearch/crowdsource-platform/pull/190#discussion_r31382023"},"pull_request":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/190"}}},"pull_request":{"url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/190","id":36474912,"html_url":"https://github.com/crowdresearch/crowdsource-platform/pull/190","diff_url":"https://github.com/crowdresearch/crowdsource-platform/pull/190.diff","patch_url":"https://github.com/crowdresearch/crowdsource-platform/pull/190.patch","issue_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/190","number":190,"state":"open","locked":false,"title":"added myself to contributors","user":{"login":"MisterCruz","id":9670009,"avatar_url":"https://avatars.githubusercontent.com/u/9670009?v=3","gravatar_id":"","url":"https://api.github.com/users/MisterCruz","html_url":"https://github.com/MisterCruz","followers_url":"https://api.github.com/users/MisterCruz/followers","following_url":"https://api.github.com/users/MisterCruz/following{/other_user}","gists_url":"https://api.github.com/users/MisterCruz/gists{/gist_id}","starred_url":"https://api.github.com/users/MisterCruz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MisterCruz/subscriptions","organizations_url":"https://api.github.com/users/MisterCruz/orgs","repos_url":"https://api.github.com/users/MisterCruz/repos","events_url":"https://api.github.com/users/MisterCruz/events{/privacy}","received_events_url":"https://api.github.com/users/MisterCruz/received_events","type":"User","site_admin":false},"body":"*merged all previous branches into one ","created_at":"2015-05-29T05:23:03Z","updated_at":"2015-05-30T16:11:31Z","closed_at":null,"merged_at":null,"merge_commit_sha":"84036c6aaf84be757d61d89f9af324c9940abe2d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/190/commits","review_comments_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/190/comments","review_comment_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/comments{/number}","comments_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/190/comments","statuses_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/statuses/9f36d504eefec99da14ea3e864c53b0a3b62f0d7","head":{"label":"MisterCruz:develop2","ref":"develop2","sha":"9f36d504eefec99da14ea3e864c53b0a3b62f0d7","user":{"login":"MisterCruz","id":9670009,"avatar_url":"https://avatars.githubusercontent.com/u/9670009?v=3","gravatar_id":"","url":"https://api.github.com/users/MisterCruz","html_url":"https://github.com/MisterCruz","followers_url":"https://api.github.com/users/MisterCruz/followers","following_url":"https://api.github.com/users/MisterCruz/following{/other_user}","gists_url":"https://api.github.com/users/MisterCruz/gists{/gist_id}","starred_url":"https://api.github.com/users/MisterCruz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MisterCruz/subscriptions","organizations_url":"https://api.github.com/users/MisterCruz/orgs","repos_url":"https://api.github.com/users/MisterCruz/repos","events_url":"https://api.github.com/users/MisterCruz/events{/privacy}","received_events_url":"https://api.github.com/users/MisterCruz/received_events","type":"User","site_admin":false},"repo":{"id":36384140,"name":"crowdsource-platform","full_name":"MisterCruz/crowdsource-platform","owner":{"login":"MisterCruz","id":9670009,"avatar_url":"https://avatars.githubusercontent.com/u/9670009?v=3","gravatar_id":"","url":"https://api.github.com/users/MisterCruz","html_url":"https://github.com/MisterCruz","followers_url":"https://api.github.com/users/MisterCruz/followers","following_url":"https://api.github.com/users/MisterCruz/following{/other_user}","gists_url":"https://api.github.com/users/MisterCruz/gists{/gist_id}","starred_url":"https://api.github.com/users/MisterCruz/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MisterCruz/subscriptions","organizations_url":"https://api.github.com/users/MisterCruz/orgs","repos_url":"https://api.github.com/users/MisterCruz/repos","events_url":"https://api.github.com/users/MisterCruz/events{/privacy}","received_events_url":"https://api.github.com/users/MisterCruz/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/MisterCruz/crowdsource-platform","description":"The main repository for Crowdsource Platform","fork":true,"url":"https://api.github.com/repos/MisterCruz/crowdsource-platform","forks_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/forks","keys_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/teams","hooks_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/hooks","issue_events_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/issues/events{/number}","events_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/events","assignees_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/assignees{/user}","branches_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/branches{/branch}","tags_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/tags","blobs_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/languages","stargazers_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/stargazers","contributors_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/contributors","subscribers_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/subscribers","subscription_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/subscription","commits_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/contents/{+path}","compare_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/merges","archive_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/downloads","issues_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/issues{/number}","pulls_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/labels{/name}","releases_url":"https://api.github.com/repos/MisterCruz/crowdsource-platform/releases{/id}","created_at":"2015-05-27T17:34:07Z","updated_at":"2015-05-27T17:34:07Z","pushed_at":"2015-05-29T05:20:39Z","git_url":"git://github.com/MisterCruz/crowdsource-platform.git","ssh_url":"git@github.com:MisterCruz/crowdsource-platform.git","clone_url":"https://github.com/MisterCruz/crowdsource-platform.git","svn_url":"https://github.com/MisterCruz/crowdsource-platform","homepage":null,"size":9863,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop2"}},"base":{"label":"crowdresearch:develop2","ref":"develop2","sha":"2e3ee2082cb121bb49b4ad197fb518efb1c23030","user":{"login":"crowdresearch","id":11791223,"avatar_url":"https://avatars.githubusercontent.com/u/11791223?v=3","gravatar_id":"","url":"https://api.github.com/users/crowdresearch","html_url":"https://github.com/crowdresearch","followers_url":"https://api.github.com/users/crowdresearch/followers","following_url":"https://api.github.com/users/crowdresearch/following{/other_user}","gists_url":"https://api.github.com/users/crowdresearch/gists{/gist_id}","starred_url":"https://api.github.com/users/crowdresearch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/crowdresearch/subscriptions","organizations_url":"https://api.github.com/users/crowdresearch/orgs","repos_url":"https://api.github.com/users/crowdresearch/repos","events_url":"https://api.github.com/users/crowdresearch/events{/privacy}","received_events_url":"https://api.github.com/users/crowdresearch/received_events","type":"Organization","site_admin":false},"repo":{"id":34006010,"name":"crowdsource-platform","full_name":"crowdresearch/crowdsource-platform","owner":{"login":"crowdresearch","id":11791223,"avatar_url":"https://avatars.githubusercontent.com/u/11791223?v=3","gravatar_id":"","url":"https://api.github.com/users/crowdresearch","html_url":"https://github.com/crowdresearch","followers_url":"https://api.github.com/users/crowdresearch/followers","following_url":"https://api.github.com/users/crowdresearch/following{/other_user}","gists_url":"https://api.github.com/users/crowdresearch/gists{/gist_id}","starred_url":"https://api.github.com/users/crowdresearch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/crowdresearch/subscriptions","organizations_url":"https://api.github.com/users/crowdresearch/orgs","repos_url":"https://api.github.com/users/crowdresearch/repos","events_url":"https://api.github.com/users/crowdresearch/events{/privacy}","received_events_url":"https://api.github.com/users/crowdresearch/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/crowdresearch/crowdsource-platform","description":"The main repository for Crowdsource Platform","fork":false,"url":"https://api.github.com/repos/crowdresearch/crowdsource-platform","forks_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/forks","keys_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/teams","hooks_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/hooks","issue_events_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/events{/number}","events_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/events","assignees_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/assignees{/user}","branches_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/branches{/branch}","tags_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/tags","blobs_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/languages","stargazers_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/stargazers","contributors_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/contributors","subscribers_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/subscribers","subscription_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/subscription","commits_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/contents/{+path}","compare_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/merges","archive_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/downloads","issues_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues{/number}","pulls_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/labels{/name}","releases_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/releases{/id}","created_at":"2015-04-15T16:36:52Z","updated_at":"2015-05-29T13:25:25Z","pushed_at":"2015-05-30T15:49:34Z","git_url":"git://github.com/crowdresearch/crowdsource-platform.git","ssh_url":"git@github.com:crowdresearch/crowdsource-platform.git","clone_url":"https://github.com/crowdresearch/crowdsource-platform.git","svn_url":"https://github.com/crowdresearch/crowdsource-platform","homepage":null,"size":24913,"stargazers_count":25,"watchers_count":25,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":80,"mirror_url":null,"open_issues_count":79,"forks":80,"open_issues":79,"watchers":25,"default_branch":"develop2"}},"_links":{"self":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/190"},"html":{"href":"https://github.com/crowdresearch/crowdsource-platform/pull/190"},"issue":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/190"},"comments":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/190/comments"},"review_comments":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/190/comments"},"review_comment":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/190/commits"},"statuses":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/statuses/9f36d504eefec99da14ea3e864c53b0a3b62f0d7"}}}}