From 501b9219b91689dba6325dcff12c6fa46b69154d Mon Sep 17 00:00:00 2001
From: britea <andreabritesma@gmail.com>
Date: Fri, 8 May 2020 10:03:31 +0200
Subject: [PATCH] resolve conflict

---
 .../smarthut/controller/ThermostatController.java           | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
index 099061a..49c31f2 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
@@ -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