merge conflicts

ulfa · Nov 2, 2013 · 053214f · 053214f
2 parents afd1257 + 05b8eca
commit 053214f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,5 @@
-                                 Apache License
+
+                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -173,5 +174,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
-
+   END OF TERMS AND CONDITIONS