Changeset 0c049e9 for sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

Timestamp:

02/08/22 23:27:06 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

ad4da86

Parents:

c71fa06 (diff), 80ddcae (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

# Conflicts:
# sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

File:

• sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java (modified) (1 diff)

sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

@@ -38 +38 @@
         this.role = v.getRole();
         this.status = v.getStatus();
-        this.locked=!v.isAccountNonLocked();
+        this.locked= !v.isAccountNonLocked();
         this.pzNames = v.getParkingZones().stream().map(ParkingZone::getPzName).collect(Collectors.toList());
     }