From 5becaa3ca40a5418e19c373d8290d3ddbf693df2 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@volti.(none)>
Date: Wed, 28 Oct 2009 13:49:37 -0700
Subject: [PATCH] Fixing the merge

---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d214c8f..f8b00ddd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,4 +30,4 @@
     </application>
 	<uses-sdk android:minSdkVersion="4" />
 
-</manifest> 
\ No newline at end of file
+</manifest>