Small hotfixes - Githubissues

AESSUQAM / EnceFAL

Gestionnaire de Foire Aux Livres

GNU General Public License v3.0

0 stars 4 forks source link

Small hotfixes #37

Closed Scriptodude closed 8 years ago

Scriptodude commented 8 years ago

Updated

.gitignore with current folder tree
.travis.yml to add --omit parameter on coverage, ignoring the virtualenv
The employee.view.py should've been in PR #35, i don't know why it isn't

@ventilooo The conflict is located in both .gitignore (the .db and other ignores) and .travis.yml (the two removed lines). It is easily manually solved, and shouldn't affect the project at all.

Scriptodude commented 8 years ago

@ventilooo can't push to the current branch. I've fixed locally the conflict but can't do much more. Exactly they are :

in requirements.txt, line 7, the comment which got added created a conflict (WTF)
in .travis.yml, line 49, the --omit parameter that got added created a conflict.

You only can fix that at the moment, keep the commented version of requirements, and the omit version of .travis.yml ^_^