git push origin sprint23 has not been working after the rebase ==> conflict in planning.html and app.js
git push origin sprint23 has not been working after the rebase ==> conflict in planning.html and app.js

OpenSTC-Eleger/swif,OpenSTC-Eleger/swif