Merge conflicts solutioned

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

diff --git a/ruralHouses/src/domain/Owner.java b/ruralHouses/src/domain/Owner.java
index a218f03..550aceb 100644 (file)
--- a/ruralHouses/src/domain/Owner.java
+++ b/ruralHouses/src/domain/Owner.java
@@ -3,9 +3,12 @@ package domain;
 import java.io.Serializable;
 import java.util.Vector;
 
-@SuppressWarnings("serial")
 public class Owner implements Serializable {
 
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
        private String bankAccount = "";
        private String name = "";
        private String mailAccount = "";