fixed meerge conflicts

server/src/main/java/com/example/demo/user/User.java

@@ -14,7 +14,7 @@ public class User {
     private String username;
     private String email;
     private String password;
-    private String email;
+
 
 
     public User(){
@@ -25,13 +25,12 @@ public class User {
         this.username = username;
         this.password = password;
         this.email = email;
-<<<<<<< HEAD
-=======
+
     }
 
     public long getId() {
         return id;
->>>>>>> roy
+
     }
 
     public void setId(long id) {
@@ -44,19 +43,13 @@ public class User {
 
     public void setUsername(String username) {
         this.username = username;
-<<<<<<< HEAD
-=======
+
     }
 
     public String getEmail() {
         return email;
     }
 
-    public void setEmail(String email) {
-        this.email = email;
->>>>>>> roy
-    }
-
     public String getPassword() {
         return password;
     }
@@ -65,10 +58,6 @@ public class User {
         this.password = password;
     }
 
-    public String getEmail() {
-        return email;
-    }
-
     public void setEmail(String email) {
         this.email = email;
     }

server/src/main/java/com/example/demo/user/UserRepository.java

@@ -2,11 +2,8 @@ package com.example.demo.user;
 
 import org.springframework.data.repository.CrudRepository;
 
-<<<<<<< HEAD
-//Auto implemenred by spring into a bean called userRepository
-=======
+
 //Auto implemented by spring into a bean called userRepository
->>>>>>> roy
 public interface UserRepository extends CrudRepository<User, Long> {
 
 }