search

blueboy / portal

This portal repo is for development purposes only
http://github.com/blueboy/portal
GNU General Public License v2.0
27 stars 24 forks source link

Git pull error #81

Closed HerrTrigger closed 8 years ago

HerrTrigger commented 8 years ago

Hello guys,

In trying to update, the following appears:

capture

Guessing related to the following commit: https://github.com/cmangos/mangos-wotlk/commit/d5758a775b9e1cac7e28acffb73463c28c8b1a29

cala commented 8 years ago

Should merge correctly, now.

HerrTrigger commented 8 years ago

Merci @cala : )