fixed merge conflict in Group.cpp

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

Closed UltimateTomatoes closed 8 years ago

UltimateTomatoes commented 8 years ago

ignore this pull request......something wrong with the compile

cala commented 8 years ago

Merging and compiling fixed in https://github.com/blueboy/portal/commit/1f97217e283235c1387ed9eb6d62cfbb49496938 and https://github.com/blueboy/portal/commit/2e2dadaea134f3ed3bceb23848a68d6f974b2175 I'm closing this pull request. @alysher again, I suggest that you clone/fork anew your portal repository: the high number of commits here show that portal master and your branch are now different.