merge conflict test

src/main/java/no/ntnu/idatt1002/demo/repo/MyEntityRepo.java

@@ -22,10 +22,7 @@ public class MyEntityRepo {
 		// Get connection (maybe use pool?)
 		// Do some SQL
 		// Return som real data
-<<<<<<< HEAD
-=======
         // merge test
->>>>>>> hans
 
 		return new MyEntity("id", "name");
     }