conflicts resolved

aa1eb4cb · Arturo Montejo Ráez · a061a982 · 9b62aed2 · aa1eb4cb · aa1eb4cb
Commit aa1eb4cb authored Feb 24, 2017 by Arturo Montejo Ráez
Showing with 1 additions and 1 deletions
android/Pictogram/commonlibrary/build.gradle
android/Pictogram/tabletlibrary/tabletlibrary.iml
--- a/android/Pictogram/commonlibrary/build.gradle
+++ b/android/Pictogram/commonlibrary/build.gradle
@@ -11,7 +11,7 @@ android {
        versionName "1.0"
        resValue "string", "db_name", "PCB.db"
        resValue "integer", "db_version", "4"
-        resValue "string", "app_version", "0.1"
+        resValue "string", "app_version", "1.0"
        resValue "string", "core_vocabulary", "core_vocabulary"
        resValue "string", "apk", "to_be_set_in_subproject"
    }

--- a/android/Pictogram/tabletlibrary/tabletlibrary.iml
+++ b/android/Pictogram/tabletlibrary/tabletlibrary.iml