merge test

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>no.ntnu.idatt1002.demo</groupId>
-    <artifactId>idatt2002demo</artifactId>
+    <artifactId>ProjectRepo</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>demo</name>
     <packaging>jar</packaging>

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

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