smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

resolve conflict

Browse source
This commit is contained in:
britea 2020-05-08 10:03:31 +02:00
parent c9f53f0c97
commit 501b9219b9
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
View file

@ -36,13 +36,7 @@ public class ThermostatController {
newT = thermostatRepository.save(newT);
newT.setOn(t.isTurnOn());
<<<<<<< Updated upstream
return deviceService.saveAsOwner(newT, principal.getName());
=======
newT = deviceService.saveAsOwner(newT, principal.getName());
System.out.println(newT);
return newT;
>>>>>>> Stashed changes
}
@PostMapping