Merge pull request #46 from ZenNotes/release/1.1.15

Release 1.1.15 (versionCode 17): Cloud conflict resolution on Android, app core 2.44.0.

Claude-Session: https://claude.ai/code/session_01CWgtKY9sdF4JREoyCzNGtP

Author: adibhanna

.zennotes-commit

@@ -1 +1 @@
-43994ff7a37557d9014c48dffd06fd9f733405bd
+f156bb1398b82f7f590d669fce5371783500f061

android/app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "md.zennotes"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 16
-        versionName "1.1.14"
+        versionCode 17
+        versionName "1.1.15"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.