fixed merge conflicts

mekjaer · mekjaer · commit a722e57d528a · 2013-10-31T12:20:12.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -88,3 +88,7 @@ doc/ref/examples/generated/com/tightdb/refdoc/*.java
 
 # generated json output in ref doc json example
 doc/ref/examples/fromServlet
+
+java/share/java/*.jar
+
+tightdb_jni/src/java/lib/l*.jnilib
diff --git a/tightdb-java-test/src/test/java/com/tightdb/experiment/InsertPerformance.java b/tightdb-java-test/src/test/java/com/tightdb/experiment/InsertPerformance.java
@@ -14,6 +14,7 @@ public static void main(String[] args) {
         t.addColumn(ColumnType.STRING, "String");
         t.addColumn(ColumnType.BOOLEAN, "Bool");
         t.addColumn(ColumnType.INTEGER, "Long");
+
         t.addColumn(ColumnType.DATE, "Date");
         
         Long timer = System.currentTimeMillis();
