Changeset 2ace8f0 for sources/app/src/main/java/parkup/entities/ParkingZone.java

Timestamp:

11/11/21 11:59:35 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

8588fcb

Parents:

97fbc67 (diff), 9504a09 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/ParkUp

File:

• sources/app/src/main/java/parkup/entities/ParkingZone.java (modified) (1 diff)

sources/app/src/main/java/parkup/entities/ParkingZone.java

@@ -33 +33 @@
     private int capacity;
 
+<<<<<<< HEAD
     @Column(name = "time_from")  //za rabotni casovi od:
     private int from;
 
     @Column(name = "time_to")    //za rabotni casovi do:
+=======
+    @Column(name = "vreme_od")  //za rabotni casovi od:
+    private int from;
+
+    @Column(name = "vreme_do")    //za rabotni casovi do:
+>>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939
     private int to;