{"action":"created","comment":{"url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/comments/51388326","id":51388326,"diff_hunk":"@@ -15,6 +15,67 @@\n \n             <!-- project.publish() -->\n \n+<<<<<<< HEAD","path":"static/templates/project/authoring.html","position":4,"original_position":4,"commit_id":"ea3f2ff6928d505351a33014e8de8a99bcf0d382","original_commit_id":"ea3f2ff6928d505351a33014e8de8a99bcf0d382","user":{"login":"dmorina","id":2858281,"avatar_url":"https://avatars.githubusercontent.com/u/2858281?v=3","gravatar_id":"","url":"https://api.github.com/users/dmorina","html_url":"https://github.com/dmorina","followers_url":"https://api.github.com/users/dmorina/followers","following_url":"https://api.github.com/users/dmorina/following{/other_user}","gists_url":"https://api.github.com/users/dmorina/gists{/gist_id}","starred_url":"https://api.github.com/users/dmorina/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dmorina/subscriptions","organizations_url":"https://api.github.com/users/dmorina/orgs","repos_url":"https://api.github.com/users/dmorina/repos","events_url":"https://api.github.com/users/dmorina/events{/privacy}","received_events_url":"https://api.github.com/users/dmorina/received_events","type":"User","site_admin":false},"body":"merge errors","created_at":"2016-02-01T08:00:24Z","updated_at":"2016-02-01T08:00:24Z","html_url":"https://github.com/crowdresearch/crowdsource-platform/pull/651#discussion_r51388326","pull_request_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/651","_links":{"self":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/comments/51388326"},"html":{"href":"https://github.com/crowdresearch/crowdsource-platform/pull/651#discussion_r51388326"},"pull_request":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/651"}}},"pull_request":{"url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/651","id":57303754,"html_url":"https://github.com/crowdresearch/crowdsource-platform/pull/651","diff_url":"https://github.com/crowdresearch/crowdsource-platform/pull/651.diff","patch_url":"https://github.com/crowdresearch/crowdsource-platform/pull/651.patch","issue_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/651","number":651,"state":"open","locked":false,"title":"Added deadline field in project Model ","user":{"login":"Curious72","id":8409274,"avatar_url":"https://avatars.githubusercontent.com/u/8409274?v=3","gravatar_id":"","url":"https://api.github.com/users/Curious72","html_url":"https://github.com/Curious72","followers_url":"https://api.github.com/users/Curious72/followers","following_url":"https://api.github.com/users/Curious72/following{/other_user}","gists_url":"https://api.github.com/users/Curious72/gists{/gist_id}","starred_url":"https://api.github.com/users/Curious72/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Curious72/subscriptions","organizations_url":"https://api.github.com/users/Curious72/orgs","repos_url":"https://api.github.com/users/Curious72/repos","events_url":"https://api.github.com/users/Curious72/events{/privacy}","received_events_url":"https://api.github.com/users/Curious72/received_events","type":"User","site_admin":false},"body":"Solved #646 ","created_at":"2016-01-27T02:04:03Z","updated_at":"2016-02-01T08:00:24Z","closed_at":null,"merged_at":null,"merge_commit_sha":"46cacf0ea2c63a01ef29c8b186ffa6428de94a99","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/651/commits","review_comments_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/651/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/651/comments","statuses_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/statuses/ea3f2ff6928d505351a33014e8de8a99bcf0d382","head":{"label":"Curious72:develop2","ref":"develop2","sha":"ea3f2ff6928d505351a33014e8de8a99bcf0d382","user":{"login":"Curious72","id":8409274,"avatar_url":"https://avatars.githubusercontent.com/u/8409274?v=3","gravatar_id":"","url":"https://api.github.com/users/Curious72","html_url":"https://github.com/Curious72","followers_url":"https://api.github.com/users/Curious72/followers","following_url":"https://api.github.com/users/Curious72/following{/other_user}","gists_url":"https://api.github.com/users/Curious72/gists{/gist_id}","starred_url":"https://api.github.com/users/Curious72/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Curious72/subscriptions","organizations_url":"https://api.github.com/users/Curious72/orgs","repos_url":"https://api.github.com/users/Curious72/repos","events_url":"https://api.github.com/users/Curious72/events{/privacy}","received_events_url":"https://api.github.com/users/Curious72/received_events","type":"User","site_admin":false},"repo":{"id":49528086,"name":"crowdsource-platform","full_name":"Curious72/crowdsource-platform","owner":{"login":"Curious72","id":8409274,"avatar_url":"https://avatars.githubusercontent.com/u/8409274?v=3","gravatar_id":"","url":"https://api.github.com/users/Curious72","html_url":"https://github.com/Curious72","followers_url":"https://api.github.com/users/Curious72/followers","following_url":"https://api.github.com/users/Curious72/following{/other_user}","gists_url":"https://api.github.com/users/Curious72/gists{/gist_id}","starred_url":"https://api.github.com/users/Curious72/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Curious72/subscriptions","organizations_url":"https://api.github.com/users/Curious72/orgs","repos_url":"https://api.github.com/users/Curious72/repos","events_url":"https://api.github.com/users/Curious72/events{/privacy}","received_events_url":"https://api.github.com/users/Curious72/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Curious72/crowdsource-platform","description":"The main repository for Crowdsource Platform","fork":true,"url":"https://api.github.com/repos/Curious72/crowdsource-platform","forks_url":"https://api.github.com/repos/Curious72/crowdsource-platform/forks","keys_url":"https://api.github.com/repos/Curious72/crowdsource-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Curious72/crowdsource-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Curious72/crowdsource-platform/teams","hooks_url":"https://api.github.com/repos/Curious72/crowdsource-platform/hooks","issue_events_url":"https://api.github.com/repos/Curious72/crowdsource-platform/issues/events{/number}","events_url":"https://api.github.com/repos/Curious72/crowdsource-platform/events","assignees_url":"https://api.github.com/repos/Curious72/crowdsource-platform/assignees{/user}","branches_url":"https://api.github.com/repos/Curious72/crowdsource-platform/branches{/branch}","tags_url":"https://api.github.com/repos/Curious72/crowdsource-platform/tags","blobs_url":"https://api.github.com/repos/Curious72/crowdsource-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Curious72/crowdsource-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Curious72/crowdsource-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/Curious72/crowdsource-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Curious72/crowdsource-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/Curious72/crowdsource-platform/languages","stargazers_url":"https://api.github.com/repos/Curious72/crowdsource-platform/stargazers","contributors_url":"https://api.github.com/repos/Curious72/crowdsource-platform/contributors","subscribers_url":"https://api.github.com/repos/Curious72/crowdsource-platform/subscribers","subscription_url":"https://api.github.com/repos/Curious72/crowdsource-platform/subscription","commits_url":"https://api.github.com/repos/Curious72/crowdsource-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/Curious72/crowdsource-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/Curious72/crowdsource-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/Curious72/crowdsource-platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/Curious72/crowdsource-platform/contents/{+path}","compare_url":"https://api.github.com/repos/Curious72/crowdsource-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Curious72/crowdsource-platform/merges","archive_url":"https://api.github.com/repos/Curious72/crowdsource-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Curious72/crowdsource-platform/downloads","issues_url":"https://api.github.com/repos/Curious72/crowdsource-platform/issues{/number}","pulls_url":"https://api.github.com/repos/Curious72/crowdsource-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/Curious72/crowdsource-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/Curious72/crowdsource-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Curious72/crowdsource-platform/labels{/name}","releases_url":"https://api.github.com/repos/Curious72/crowdsource-platform/releases{/id}","deployments_url":"https://api.github.com/repos/Curious72/crowdsource-platform/deployments","created_at":"2016-01-12T20:51:07Z","updated_at":"2016-01-12T20:51:08Z","pushed_at":"2016-01-31T06:56:01Z","git_url":"git://github.com/Curious72/crowdsource-platform.git","ssh_url":"git@github.com:Curious72/crowdsource-platform.git","clone_url":"https://github.com/Curious72/crowdsource-platform.git","svn_url":"https://github.com/Curious72/crowdsource-platform","homepage":null,"size":16061,"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":"c73d68119e3cefd38fa412111ed3537de4933fc9","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}","deployments_url":"https://api.github.com/repos/crowdresearch/crowdsource-platform/deployments","created_at":"2015-04-15T16:36:52Z","updated_at":"2016-01-27T18:00:37Z","pushed_at":"2016-01-31T19:52:07Z","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":33924,"stargazers_count":90,"watchers_count":90,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":204,"mirror_url":null,"open_issues_count":60,"forks":204,"open_issues":60,"watchers":90,"default_branch":"develop2"}},"_links":{"self":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/651"},"html":{"href":"https://github.com/crowdresearch/crowdsource-platform/pull/651"},"issue":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/651"},"comments":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/issues/651/comments"},"review_comments":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/pulls/651/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/651/commits"},"statuses":{"href":"https://api.github.com/repos/crowdresearch/crowdsource-platform/statuses/ea3f2ff6928d505351a33014e8de8a99bcf0d382"}}}}