Conflicts: airtime_mvc/application/models/Schedule.php python_apps/pypo/pypofetch.py python_apps/pypo/pypopush.py -weird conflict. I must have committed while I had my changes git-stash'ed |
||
---|---|---|
.. | ||
application | ||
build | ||
library | ||
public | ||
tests |
Conflicts: airtime_mvc/application/models/Schedule.php python_apps/pypo/pypofetch.py python_apps/pypo/pypopush.py -weird conflict. I must have committed while I had my changes git-stash'ed |
||
---|---|---|
.. | ||
application | ||
build | ||
library | ||
public | ||
tests |