resolve conflict
This commit is contained in:
parent
c9f53f0c97
commit
501b9219b9
1 changed files with 0 additions and 6 deletions
|
@ -36,13 +36,7 @@ public class ThermostatController {
|
||||||
newT = thermostatRepository.save(newT);
|
newT = thermostatRepository.save(newT);
|
||||||
|
|
||||||
newT.setOn(t.isTurnOn());
|
newT.setOn(t.isTurnOn());
|
||||||
<<<<<<< Updated upstream
|
|
||||||
return deviceService.saveAsOwner(newT, principal.getName());
|
return deviceService.saveAsOwner(newT, principal.getName());
|
||||||
=======
|
|
||||||
newT = deviceService.saveAsOwner(newT, principal.getName());
|
|
||||||
System.out.println(newT);
|
|
||||||
return newT;
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping
|
@PostMapping
|
||||||
|
|
Loading…
Reference in a new issue