Fixed error #1798

[greg-han]

Here is the link to the error.
#1798

I just deleted a word in the main.html file.

[coveralls]

Coverage remained the same at 78.568% when pulling cce7071 on greg-han:master into 18ad905 on openhatch:master.

[codecov-io]

Current coverage is 78.56% (diff: 100%)

Merging #1800 into master will not change coverage

@@             master      #1800   diff @@
==========================================
  Files            70         70          
  Lines          5935       5935          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits           4663       4663          
  Misses         1272       1272          
  Partials          0          0          

Powered by Codecov. Last update 18ad905...4de104e

[coveralls]

Coverage remained the same at 78.568% when pulling 4de104e on greg-han:master into 18ad905 on openhatch:master.

[rafpaf]

Hey greg-han, thank you so much for looking into this! I had a look here on GitHub at the diff between your code and the openhatch master branch. It looks like there's more changes than just the typo fix. If you have a moment and could make another pull request, with just that one small change, that would be great.

[greg-han]

Hey. Thanks for taking a look at my commit. I deleted a couple files and resynced so it should be cool now.

…

On Tue, Dec 27, 2016 at 6:56 PM, Raphael Krut-Landau < ***@***.***> wrote: Hey greg-han, thank you so much for looking into this! I had a look here on GitHub at the diff between your code and the openhatch master branch. It looks like there's more changes than just the typo fix. If you have a moment and could make another pull request, with just that one small change, that would be great. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#1800 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AXlvZNDFbGULpMINwyTZSRuJ2rKOwZ94ks5rMc_vgaJpZM4LV5nD> .

[eppeters]

Hey @greg-han, I'm new here, but since nothing has happened on this for a few days, I figured I'd suggest a way to make it right.

There's still extra stuff in your fork's master branch. To fix this, you can destroy your fork on github, delete your local copy of the fork, re-fork this repo, re-clone your fork, and make only your typo fix, and make a new PR.

[eppeters]

Don't think you meant to make this change.

[eppeters]

Merge conflict markers were committed!

[eppeters]

I think this is what you wanted to get in there.

[greg-han]

Thanks. That's what i'm doing now. How did you diff my repository with the oh-mainline one?

…

On Sat, Dec 31, 2016 at 5:13 PM, Eddie Peters ***@***.***> wrote: ***@***.**** requested changes on this pull request. Hey @greg-han <https://github.com/greg-han>, I'm new here, but since nothing has happened on this for a few days, I figured I'd suggest a way to make it right. There's still extra stuff in your fork's master branch. To fix this, you can destroy your fork on github, delete your local copy of the fork, re-fork this repo, re-clone your fork, and make only your typo fix, and make a new PR. ------------------------------ In mysite/missions/__init__.py <#1800 (review)> : > -# Copyright (C) 2010 John Stumpo -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# This file is part of OpenHatch. +# Copyright (C) 2009 OpenHatch, Inc. Don't think you meant to make this change. ------------------------------ In mysite/missions/templates/missions/main.html <#1800 (review)> : > @@ -173,3 +174,180 @@ <h3 class="up-top"><img alt='Training Missions' id='training-missions' alt='Trai </div> </div> {% endblock main %} +======= Merge conflict markers were committed! ------------------------------ In mysite/missions/templates/missions/main.html <#1800 (review)> : > @@ -44,7 +45,7 @@ <h3 class="up-top"><img alt='Training Missions' id='training-missions' alt='Trai <h2>Get to know about: "The Shell"</h2> - <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. + <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. I think this is what you wanted to get in there. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1800 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AXlvZOPCgQBqTyMzlkDlFw6FOuwy2AObks5rNv2_gaJpZM4LV5nD> .