{"action":"created","issue":{"url":"https://api.github.com/repos/openhatch/oh-mainline/issues/1800","repository_url":"https://api.github.com/repos/openhatch/oh-mainline","labels_url":"https://api.github.com/repos/openhatch/oh-mainline/issues/1800/labels{/name}","comments_url":"https://api.github.com/repos/openhatch/oh-mainline/issues/1800/comments","events_url":"https://api.github.com/repos/openhatch/oh-mainline/issues/1800/events","html_url":"https://github.com/openhatch/oh-mainline/pull/1800","id":197616267,"number":1800,"title":"Fixed error #1798","user":{"login":"greg-han","id":24735588,"avatar_url":"https://avatars.githubusercontent.com/u/24735588?v=3","gravatar_id":"","url":"https://api.github.com/users/greg-han","html_url":"https://github.com/greg-han","followers_url":"https://api.github.com/users/greg-han/followers","following_url":"https://api.github.com/users/greg-han/following{/other_user}","gists_url":"https://api.github.com/users/greg-han/gists{/gist_id}","starred_url":"https://api.github.com/users/greg-han/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/greg-han/subscriptions","organizations_url":"https://api.github.com/users/greg-han/orgs","repos_url":"https://api.github.com/users/greg-han/repos","events_url":"https://api.github.com/users/greg-han/events{/privacy}","received_events_url":"https://api.github.com/users/greg-han/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":6,"created_at":"2016-12-26T20:02:52Z","updated_at":"2017-01-05T05:25:02Z","closed_at":"2017-01-05T05:22:12Z","pull_request":{"url":"https://api.github.com/repos/openhatch/oh-mainline/pulls/1800","html_url":"https://github.com/openhatch/oh-mainline/pull/1800","diff_url":"https://github.com/openhatch/oh-mainline/pull/1800.diff","patch_url":"https://github.com/openhatch/oh-mainline/pull/1800.patch"},"body":"Here is the link to the error.\r\nhttps://github.com/openhatch/oh-mainline/issues/1798\r\n\r\nI just deleted a word in the main.html file."},"comment":{"url":"https://api.github.com/repos/openhatch/oh-mainline/issues/comments/270566725","html_url":"https://github.com/openhatch/oh-mainline/pull/1800#issuecomment-270566725","issue_url":"https://api.github.com/repos/openhatch/oh-mainline/issues/1800","id":270566725,"user":{"login":"greg-han","id":24735588,"avatar_url":"https://avatars.githubusercontent.com/u/24735588?v=3","gravatar_id":"","url":"https://api.github.com/users/greg-han","html_url":"https://github.com/greg-han","followers_url":"https://api.github.com/users/greg-han/followers","following_url":"https://api.github.com/users/greg-han/following{/other_user}","gists_url":"https://api.github.com/users/greg-han/gists{/gist_id}","starred_url":"https://api.github.com/users/greg-han/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/greg-han/subscriptions","organizations_url":"https://api.github.com/users/greg-han/orgs","repos_url":"https://api.github.com/users/greg-han/repos","events_url":"https://api.github.com/users/greg-han/events{/privacy}","received_events_url":"https://api.github.com/users/greg-han/received_events","type":"User","site_admin":false},"created_at":"2017-01-05T05:25:02Z","updated_at":"2017-01-05T05:25:02Z","body":"Thanks. That's what i'm doing now.\nHow did you diff my repository with the oh-mainline one?\n\nOn Sat, Dec 31, 2016 at 5:13 PM, Eddie Peters <notifications@github.com>\nwrote:\n\n> *@eppeters* requested changes on this pull request.\n>\n> Hey @greg-han <https://github.com/greg-han>, I'm new here, but since\n> nothing has happened on this for a few days, I figured I'd suggest a way to\n> make it right.\n>\n> There's still extra stuff in your fork's master branch. To fix this, you\n> can destroy your fork on github, delete your local copy of the fork,\n> re-fork this repo, re-clone your fork, and make only your typo fix, and\n> make a new PR.\n> ------------------------------\n>\n> In mysite/missions/__init__.py\n> <https://github.com/openhatch/oh-mainline/pull/1800#pullrequestreview-14809267>\n> :\n>\n> > -# Copyright (C) 2010 John Stumpo\n> -#\n> -# This program is free software: you can redistribute it and/or modify\n> -# it under the terms of the GNU Affero General Public License as published by\n> -# the Free Software Foundation, either version 3 of the License, or\n> -# (at your option) any later version.\n> -#\n> -# This program is distributed in the hope that it will be useful,\n> -# but WITHOUT ANY WARRANTY; without even the implied warranty of\n> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n> -# GNU Affero General Public License for more details.\n> -#\n> -# You should have received a copy of the GNU Affero General Public License\n> -# along with this program.  If not, see <http://www.gnu.org/licenses/>.\n> +# This file is part of OpenHatch.\n> +# Copyright (C) 2009 OpenHatch, Inc.\n>\n> Don't think you meant to make this change.\n> ------------------------------\n>\n> In mysite/missions/templates/missions/main.html\n> <https://github.com/openhatch/oh-mainline/pull/1800#pullrequestreview-14809267>\n> :\n>\n> > @@ -173,3 +174,180 @@ <h3 class=\"up-top\"><img alt='Training Missions' id='training-missions' alt='Trai\n>    </div>\n>  </div>\n>  {% endblock main %}\n> +=======\n>\n> Merge conflict markers were committed!\n> ------------------------------\n>\n> In mysite/missions/templates/missions/main.html\n> <https://github.com/openhatch/oh-mainline/pull/1800#pullrequestreview-14809267>\n> :\n>\n> > @@ -44,7 +45,7 @@ <h3 class=\"up-top\"><img alt='Training Missions' id='training-missions' alt='Trai\n>\n>      <h2>Get to know about: \"The Shell\"</h2>\n>\n> -    <p>These missions teach you about how to use the command line tool called as the \"shell\" and few basic commands which will help you in other missions.\n> +    <p>These missions teach you about how to use the command line tool called the \"shell\" and few basic commands which will help you in other missions.\n>\n> I think this is what you wanted to get in there.\n>\n> —\n> You are receiving this because you were mentioned.\n> Reply to this email directly, view it on GitHub\n> <https://github.com/openhatch/oh-mainline/pull/1800#pullrequestreview-14809267>,\n> or mute the thread\n> <https://github.com/notifications/unsubscribe-auth/AXlvZOPCgQBqTyMzlkDlFw6FOuwy2AObks5rNv2_gaJpZM4LV5nD>\n> .\n>\n"}}
{"actor":{"display_login":"greg-han"}}