{"action":"created","comment":{"url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/comments/29469580","id":29469580,"diff_hunk":"@@ -28,17 +28,17 @@\n   <article class=\"error-prompt\">\n     % if error == '404':\n       <h1>${_(\"The Page You Requested Page Cannot be Found\")}</h1>\n-<<<<<<< HEAD\n-      <p class=\"description\">${_(\"We're sorry. We couldn't find the Studio page you're looking for. You may want to return to the Studio Dashboard and try again. If you are still having problems accessing things, please feel free to {link_start}contact Studio support{link_end} for further help.\").format(\n-          link_start='<a href=\"https://groups.google.com/d/forum/openedx-studio\" target=\"_blank\" title=\"{title}\">'.format(title=_(\"Use our feedback tool, Tender, to share your feedback\")),\n-          link_end='</a>',\n-        )}</p>\n-    % elif error == '500':\n-      <h1>${_(\"The Server Encountered an Error\")}</h1>\n-      <p class=\"description\">${_(\"We're sorry. There was a problem with the server while trying to process your last request. You may want to return to the Studio Dashboard or try this request again. If you are still having problems accessing things, please feel free to {link_start}contact Studio support{link_end} for further help.\").format(\n-          link_start='<a href=\"https://groups.google.com/d/forum/openedx-studio\" target=\"_blank\" title=\"{title}\">'.format(title=_(\"Use our feedback tool, Tender, to share your feedback\")),\n-          link_end='</a>',\n-=======\n+<!-- <<<<<<< HEAD -->","path":"cms/templates/error.html","position":15,"original_position":15,"commit_id":"ab139f3d72e7037be75ee450c589b4dcf6a196bb","original_commit_id":"ab139f3d72e7037be75ee450c589b4dcf6a196bb","user":{"login":"stvstnfrd","id":7300975,"avatar_url":"https://avatars.githubusercontent.com/u/7300975?v=3","gravatar_id":"","url":"https://api.github.com/users/stvstnfrd","html_url":"https://github.com/stvstnfrd","followers_url":"https://api.github.com/users/stvstnfrd/followers","following_url":"https://api.github.com/users/stvstnfrd/following{/other_user}","gists_url":"https://api.github.com/users/stvstnfrd/gists{/gist_id}","starred_url":"https://api.github.com/users/stvstnfrd/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/stvstnfrd/subscriptions","organizations_url":"https://api.github.com/users/stvstnfrd/orgs","repos_url":"https://api.github.com/users/stvstnfrd/repos","events_url":"https://api.github.com/users/stvstnfrd/events{/privacy}","received_events_url":"https://api.github.com/users/stvstnfrd/received_events","type":"User","site_admin":false},"body":"Are you sure?\r\n\r\nThe difference I'm seeing is that they've parameterized the term \"Studio\".  While it still defaults to \"Studio\", this allows you to change it so it displays something like \"Please contact Stanford Online Course Creator support...\" instead of \"Please contact Studio support...\"\r\n\r\nIt also looks like the contact link is now customizable too.\r\n\r\nThis change is propagated throughout the codebase, so I think we should avoid forking here if we don't need to; I think the text is still the same","created_at":"2015-04-30T20:58:05Z","updated_at":"2015-04-30T20:58:05Z","html_url":"https://github.com/Stanford-Online/edx-platform/pull/286#discussion_r29469580","pull_request_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/286","_links":{"self":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/comments/29469580"},"html":{"href":"https://github.com/Stanford-Online/edx-platform/pull/286#discussion_r29469580"},"pull_request":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/286"}}},"pull_request":{"url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/286","id":34327813,"html_url":"https://github.com/Stanford-Online/edx-platform/pull/286","diff_url":"https://github.com/Stanford-Online/edx-platform/pull/286.diff","patch_url":"https://github.com/Stanford-Online/edx-platform/pull/286.patch","issue_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/286","number":286,"state":"open","locked":false,"title":"Resolve merge conflicts","user":{"login":"stvstnfrd","id":7300975,"avatar_url":"https://avatars.githubusercontent.com/u/7300975?v=3","gravatar_id":"","url":"https://api.github.com/users/stvstnfrd","html_url":"https://github.com/stvstnfrd","followers_url":"https://api.github.com/users/stvstnfrd/followers","following_url":"https://api.github.com/users/stvstnfrd/following{/other_user}","gists_url":"https://api.github.com/users/stvstnfrd/gists{/gist_id}","starred_url":"https://api.github.com/users/stvstnfrd/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/stvstnfrd/subscriptions","organizations_url":"https://api.github.com/users/stvstnfrd/orgs","repos_url":"https://api.github.com/users/stvstnfrd/repos","events_url":"https://api.github.com/users/stvstnfrd/events{/privacy}","received_events_url":"https://api.github.com/users/stvstnfrd/received_events","type":"User","site_admin":false},"body":"Merge from edx/edx-platform@00b75f0119b981641833240be214ef2076329747","created_at":"2015-04-29T01:40:59Z","updated_at":"2015-04-30T20:58:05Z","closed_at":null,"merged_at":null,"merge_commit_sha":"84502a4aa4509a41e86501de90cf73a49303141b","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/286/commits","review_comments_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/286/comments","review_comment_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/286/comments","statuses_url":"https://api.github.com/repos/Stanford-Online/edx-platform/statuses/ab139f3d72e7037be75ee450c589b4dcf6a196bb","head":{"label":"stvstnfrd:merge/resolutions","ref":"merge/resolutions","sha":"ab139f3d72e7037be75ee450c589b4dcf6a196bb","user":{"login":"stvstnfrd","id":7300975,"avatar_url":"https://avatars.githubusercontent.com/u/7300975?v=3","gravatar_id":"","url":"https://api.github.com/users/stvstnfrd","html_url":"https://github.com/stvstnfrd","followers_url":"https://api.github.com/users/stvstnfrd/followers","following_url":"https://api.github.com/users/stvstnfrd/following{/other_user}","gists_url":"https://api.github.com/users/stvstnfrd/gists{/gist_id}","starred_url":"https://api.github.com/users/stvstnfrd/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/stvstnfrd/subscriptions","organizations_url":"https://api.github.com/users/stvstnfrd/orgs","repos_url":"https://api.github.com/users/stvstnfrd/repos","events_url":"https://api.github.com/users/stvstnfrd/events{/privacy}","received_events_url":"https://api.github.com/users/stvstnfrd/received_events","type":"User","site_admin":false},"repo":{"id":21055408,"name":"edx-platform","full_name":"stvstnfrd/edx-platform","owner":{"login":"stvstnfrd","id":7300975,"avatar_url":"https://avatars.githubusercontent.com/u/7300975?v=3","gravatar_id":"","url":"https://api.github.com/users/stvstnfrd","html_url":"https://github.com/stvstnfrd","followers_url":"https://api.github.com/users/stvstnfrd/followers","following_url":"https://api.github.com/users/stvstnfrd/following{/other_user}","gists_url":"https://api.github.com/users/stvstnfrd/gists{/gist_id}","starred_url":"https://api.github.com/users/stvstnfrd/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/stvstnfrd/subscriptions","organizations_url":"https://api.github.com/users/stvstnfrd/orgs","repos_url":"https://api.github.com/users/stvstnfrd/repos","events_url":"https://api.github.com/users/stvstnfrd/events{/privacy}","received_events_url":"https://api.github.com/users/stvstnfrd/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/stvstnfrd/edx-platform","description":"the edX learning management system (LMS) and course authoring tool, Studio","fork":true,"url":"https://api.github.com/repos/stvstnfrd/edx-platform","forks_url":"https://api.github.com/repos/stvstnfrd/edx-platform/forks","keys_url":"https://api.github.com/repos/stvstnfrd/edx-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/stvstnfrd/edx-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/stvstnfrd/edx-platform/teams","hooks_url":"https://api.github.com/repos/stvstnfrd/edx-platform/hooks","issue_events_url":"https://api.github.com/repos/stvstnfrd/edx-platform/issues/events{/number}","events_url":"https://api.github.com/repos/stvstnfrd/edx-platform/events","assignees_url":"https://api.github.com/repos/stvstnfrd/edx-platform/assignees{/user}","branches_url":"https://api.github.com/repos/stvstnfrd/edx-platform/branches{/branch}","tags_url":"https://api.github.com/repos/stvstnfrd/edx-platform/tags","blobs_url":"https://api.github.com/repos/stvstnfrd/edx-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/stvstnfrd/edx-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/stvstnfrd/edx-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/stvstnfrd/edx-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/stvstnfrd/edx-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/stvstnfrd/edx-platform/languages","stargazers_url":"https://api.github.com/repos/stvstnfrd/edx-platform/stargazers","contributors_url":"https://api.github.com/repos/stvstnfrd/edx-platform/contributors","subscribers_url":"https://api.github.com/repos/stvstnfrd/edx-platform/subscribers","subscription_url":"https://api.github.com/repos/stvstnfrd/edx-platform/subscription","commits_url":"https://api.github.com/repos/stvstnfrd/edx-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/stvstnfrd/edx-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/stvstnfrd/edx-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/stvstnfrd/edx-platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/stvstnfrd/edx-platform/contents/{+path}","compare_url":"https://api.github.com/repos/stvstnfrd/edx-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/stvstnfrd/edx-platform/merges","archive_url":"https://api.github.com/repos/stvstnfrd/edx-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/stvstnfrd/edx-platform/downloads","issues_url":"https://api.github.com/repos/stvstnfrd/edx-platform/issues{/number}","pulls_url":"https://api.github.com/repos/stvstnfrd/edx-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/stvstnfrd/edx-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/stvstnfrd/edx-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/stvstnfrd/edx-platform/labels{/name}","releases_url":"https://api.github.com/repos/stvstnfrd/edx-platform/releases{/id}","created_at":"2014-06-20T23:21:58Z","updated_at":"2015-03-18T19:16:49Z","pushed_at":"2015-04-30T18:40:02Z","git_url":"git://github.com/stvstnfrd/edx-platform.git","ssh_url":"git@github.com:stvstnfrd/edx-platform.git","clone_url":"https://github.com/stvstnfrd/edx-platform.git","svn_url":"https://github.com/stvstnfrd/edx-platform","homepage":"http://code.edx.org/","size":407011,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"Stanford-Online:merge/conflicts","ref":"merge/conflicts","sha":"1cb31710976dea476304efa3b2c7aed19627330a","user":{"login":"Stanford-Online","id":2159497,"avatar_url":"https://avatars.githubusercontent.com/u/2159497?v=3","gravatar_id":"","url":"https://api.github.com/users/Stanford-Online","html_url":"https://github.com/Stanford-Online","followers_url":"https://api.github.com/users/Stanford-Online/followers","following_url":"https://api.github.com/users/Stanford-Online/following{/other_user}","gists_url":"https://api.github.com/users/Stanford-Online/gists{/gist_id}","starred_url":"https://api.github.com/users/Stanford-Online/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Stanford-Online/subscriptions","organizations_url":"https://api.github.com/users/Stanford-Online/orgs","repos_url":"https://api.github.com/users/Stanford-Online/repos","events_url":"https://api.github.com/users/Stanford-Online/events{/privacy}","received_events_url":"https://api.github.com/users/Stanford-Online/received_events","type":"Organization","site_admin":false},"repo":{"id":11616657,"name":"edx-platform","full_name":"Stanford-Online/edx-platform","owner":{"login":"Stanford-Online","id":2159497,"avatar_url":"https://avatars.githubusercontent.com/u/2159497?v=3","gravatar_id":"","url":"https://api.github.com/users/Stanford-Online","html_url":"https://github.com/Stanford-Online","followers_url":"https://api.github.com/users/Stanford-Online/followers","following_url":"https://api.github.com/users/Stanford-Online/following{/other_user}","gists_url":"https://api.github.com/users/Stanford-Online/gists{/gist_id}","starred_url":"https://api.github.com/users/Stanford-Online/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Stanford-Online/subscriptions","organizations_url":"https://api.github.com/users/Stanford-Online/orgs","repos_url":"https://api.github.com/users/Stanford-Online/repos","events_url":"https://api.github.com/users/Stanford-Online/events{/privacy}","received_events_url":"https://api.github.com/users/Stanford-Online/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Stanford-Online/edx-platform","description":"the edX learning management system (LMS) and course authoring tool, Studio","fork":true,"url":"https://api.github.com/repos/Stanford-Online/edx-platform","forks_url":"https://api.github.com/repos/Stanford-Online/edx-platform/forks","keys_url":"https://api.github.com/repos/Stanford-Online/edx-platform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Stanford-Online/edx-platform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Stanford-Online/edx-platform/teams","hooks_url":"https://api.github.com/repos/Stanford-Online/edx-platform/hooks","issue_events_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/events{/number}","events_url":"https://api.github.com/repos/Stanford-Online/edx-platform/events","assignees_url":"https://api.github.com/repos/Stanford-Online/edx-platform/assignees{/user}","branches_url":"https://api.github.com/repos/Stanford-Online/edx-platform/branches{/branch}","tags_url":"https://api.github.com/repos/Stanford-Online/edx-platform/tags","blobs_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/refs{/sha}","trees_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Stanford-Online/edx-platform/statuses/{sha}","languages_url":"https://api.github.com/repos/Stanford-Online/edx-platform/languages","stargazers_url":"https://api.github.com/repos/Stanford-Online/edx-platform/stargazers","contributors_url":"https://api.github.com/repos/Stanford-Online/edx-platform/contributors","subscribers_url":"https://api.github.com/repos/Stanford-Online/edx-platform/subscribers","subscription_url":"https://api.github.com/repos/Stanford-Online/edx-platform/subscription","commits_url":"https://api.github.com/repos/Stanford-Online/edx-platform/commits{/sha}","git_commits_url":"https://api.github.com/repos/Stanford-Online/edx-platform/git/commits{/sha}","comments_url":"https://api.github.com/repos/Stanford-Online/edx-platform/comments{/number}","issue_comment_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/comments{/number}","contents_url":"https://api.github.com/repos/Stanford-Online/edx-platform/contents/{+path}","compare_url":"https://api.github.com/repos/Stanford-Online/edx-platform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Stanford-Online/edx-platform/merges","archive_url":"https://api.github.com/repos/Stanford-Online/edx-platform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Stanford-Online/edx-platform/downloads","issues_url":"https://api.github.com/repos/Stanford-Online/edx-platform/issues{/number}","pulls_url":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls{/number}","milestones_url":"https://api.github.com/repos/Stanford-Online/edx-platform/milestones{/number}","notifications_url":"https://api.github.com/repos/Stanford-Online/edx-platform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Stanford-Online/edx-platform/labels{/name}","releases_url":"https://api.github.com/repos/Stanford-Online/edx-platform/releases{/id}","created_at":"2013-07-23T19:05:46Z","updated_at":"2015-04-28T22:31:57Z","pushed_at":"2015-04-30T18:40:09Z","git_url":"git://github.com/Stanford-Online/edx-platform.git","ssh_url":"git@github.com:Stanford-Online/edx-platform.git","clone_url":"https://github.com/Stanford-Online/edx-platform.git","svn_url":"https://github.com/Stanford-Online/edx-platform","homepage":"http://code.edx.org/","size":424927,"stargazers_count":13,"watchers_count":13,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":50,"forks":2,"open_issues":50,"watchers":13,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/286"},"html":{"href":"https://github.com/Stanford-Online/edx-platform/pull/286"},"issue":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/286"},"comments":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/issues/286/comments"},"review_comments":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/286/comments"},"review_comment":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/pulls/286/commits"},"statuses":{"href":"https://api.github.com/repos/Stanford-Online/edx-platform/statuses/ab139f3d72e7037be75ee450c589b4dcf6a196bb"}}}}