ijiraq
commented
7 years ago @austinbeauch do you want to make the small changes to the import statements I noticed and then re-push or shall we merge this into the repo as is and then make those corrections later?
mopmerge is the new branch I created in my forked Octarine repo, then I pulled my local daomop directory which was just cloned from https://github.com/ijiraq/daomop. No merge conflicts, but it looks like there is a ton of deletions to the original Octarine files. Not sure if that's desired so definitely take a look through everything and let me know.