search

askewseth / Concordanator

A java based application to create and search word concordances of public domain texts.
https://sible777.github.io/Concordanator
MIT License
0 stars 1 forks source link

Bookshelf into Master #12

Closed corysabol closed 8 years ago

corysabol commented 8 years ago

Please look over file changes and sign off on them.

We need to eventually merge all the work together and rebase out from that work on a common ground.

I will handle the actual logistics of that. Just make a pull request to merge to the master when your code is ready.

corysabol commented 8 years ago

There are conflicts between your branch and the master branch. I'm not sure what they are though. I think it's probably some netbeans file that snuck in there or something.

We need to work back out off of the master branch so that there is reduced conflicts. So, before you make too many more changes I will have to cherry-pick your code into the master, then we should do the same for seths code and then remove the other branches and create new ones from there.

This should resolve the troubles we have been having.

corysabol commented 8 years ago

Resolved