resolve conflict

sunnnl
Commit 11b50b82ebcd34083361d7da192bb66633874442 11b50b82 2 parents bd075098 39aa2508
Showing 1 changed file with 1 additions and 1 deletions
app/src/main/java/com/sunnni/smartdoorlock/data/RemoteRecord.java
--- a/app/src/main/java/com/sunnni/smartdoorlock/data/RemoteRecord.java
View file @11b50b8
+++ b/app/src/main/java/com/sunnni/smartdoorlock/data/RemoteRecord.java
View file @11b50b8
@@ -4,7 +4,7 @@ public class RemoteRecord {
     private String deviceName;
     private String created;
 
-     public RemoteRecord(String deviceName, String created) {
+     public RemoteRecord(String deviceName, String created){
         this.deviceName = deviceName;
         this.created = created;
     }