Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses / src / domain / Booking.java

diff --git a/ruralHouses/src/domain/Booking.java b/ruralHouses/src/domain/Booking.java
index 51546c3..0f72a6c 100644 (file)
--- a/ruralHouses/src/domain/Booking.java
+++ b/ruralHouses/src/domain/Booking.java
@@ -3,8 +3,12 @@ package domain;
 import java.io.Serializable;
 import java.util.Date;
 
-@SuppressWarnings("serial")
-public class Booking implements Serializable {
+public class Booking implements Serializable  {
+
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
        private int bookingNumber;
        private boolean isPaid;
        private Date bookingDate;