Version HEAD of static/scripts/java/svc1.8.3/home.js left in tree.ĬONFLICT (modify/delete): sd_reference.txt deleted in aee472a150e7c27cd7b1f0c68c47fe104a99696e and modified in HEAD. Removing static/scripts/java/svc1.8.3/manualmode.jsĬONFLICT (modify/delete): static/scripts/java/svc1.8.3/home.js deleted in aee472a150e7c27cd7b1f0c68c47fe104a99696e and modified in HEAD. Removing static/scripts/java/svc1.8.3/modprog.js Removing static/scripts/java/svc1.8.3/plotprog.js Removing static/scripts/java/svc1.8.3/progmode.js Removing static/scripts/java/svc1.8.3/viewoptions.js Removing static/scripts/java/svc1.8.3/viewprog.js Removing static/scripts/java/svc1.8.3/viewro.js Removing static/scripts/java/svc1.8.3/viewstations.js * firmware_based -> origin/firmware_basedĬONFLICT (add/add): Merge conflict in urls.pyĬONFLICT (add/add): Merge conflict in templates/monthly.html + 4496f83…aee472a master -> origin/master (forced update)
OPENSPRINKLER GITHUB DAN UPDATE
I decided to make an update so I ssh to it and login. Power reset got it airborne but after a couple of days … the same thing happened. It has been working OK for a long time but recently I discovered that it died … could not contact it via webinterface or ssh. I have Python Interval Program for OpenSprinkler Pi running on a Rasberry Pi.
0 kommentar(er)
