code4nova / ingredient.guru

This is the central repo for work on the Ingredient.guru project
2 stars 0 forks source link

Merge issues #8

Closed fcrisafulli-dev closed 5 years ago

fcrisafulli-dev commented 5 years ago

Merging the crotest_new branch with master would probably make a merge conflict. All the files related to CRO should be in their own folder and the rest of ingredient-guru should be included as well.

fcrisafulli-dev commented 5 years ago

Branch was moved to feature/CRO