Added back the missing Android support library and repaired the .giti…

…gnore file
readium · Jan 2, 2015 · 35adf0c · 35adf0c
1 parent c1b9694
commit 35adf0c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,14 +24,9 @@ local.properties
 .classpath
 #.project
 
-<<<<<<< HEAD
-# MacOS
-.DS_Store
-=======
 # IDEA project files
 .idea
 
 SDKLauncher-Android/assets/readium-shared-js/epubReadingSystem_.js
 SDKLauncher-Android/.settings/org.eclipse.core.resources.prefs
-SDKLauncher-Android/lint.xml
->>>>>>> release/0.16
+SDKLauncher-Android/lint.xml
diff --git a/SDKLauncher-Android/libs/android-support-v4.jar b/SDKLauncher-Android/libs/android-support-v4.jar