Merge branch 'master' of github.com:commonsguy/cwac-merge

Conflicts: README.markdown merge/AndroidManifest.xml
commonsguy · Jun 22, 2014 · 04b7156 · 04b7156
2 parents 26447e1 + ab03ad4
commit 04b7156
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/README.markdown b/README.markdown
@@ -17,7 +17,7 @@ widgets.
 Installation
 ------------
 This Android library project is 
-[available as a JAR](https://gihub.com/commonsguy/cwac-merge/releases).
+[available as a JAR](https://github.com/commonsguy/cwac-merge/releases).
 If you wish to use the JAR, you will need to also add the JAR from
 [the CWAC-Sacklist project](http://github.com/commonsguy/cwac-sacklist) to your
 project

diff --git a/merge/AndroidManifest.xml b/merge/AndroidManifest.xml
@@ -3,5 +3,4 @@
 	package="com.commonsware.cwac.merge"
 	android:versionCode="1"
 	android:versionName="1.0">
-
 </manifest>