Merge conflict

rawbase · Mar 3, 2014 · 1e33448 · 1e33448
2 parents 3931ebe + bdf0fae
commit 1e33448
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,7 @@ config.js
 .settings/
 .classpath
 .project
+*.class
+*.jar
+*.war
+*.ear
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,4 @@
-
-                                 Apache License
+Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 

diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+R&Wbase-server
+==============
+
+Fuseki-based implementation of a distributed versioned triple store