search

EmilHernvall / tregmine

The tregmine plugins
http://tregmine.info/
BSD 4-Clause "Original" or "Old" License
8 stars 10 forks source link

I screwed up somewhere. #223

Closed sabersamus closed 10 years ago

sabersamus commented 10 years ago

I don't know how to fix it, I did the best I could.

I was just trying to bring everything up to date and I borked it.

JoshMorgan commented 10 years ago

Wow.

sabersamus commented 10 years ago

There are all the commits that banking is behind master

lDiverse commented 10 years ago

Would've probably been easier just finding out all the differences, and then merge banking with master. Rather than trying to do what you are here and merging master with banking.

A lot easier ;p

EmilHernvall commented 10 years ago

I'll just do it by hand, Rob. I can rebase your branch locally and merge it.