Merge branch 'master' of [email protected]:nadam/nfc-reader.git

Conflicts: AndroidManifest.xml
iddqd3 · Sep 14, 2012 · 13a53ae · 13a53ae
2 parents a3e9b61 + 9dd8fa9
commit 13a53ae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -45,4 +45,4 @@
         </activity>
     </application>
 
-</manifest> 
+</manifest>