From c156f0514fc9b6473bf459131b8369656da4529e Mon Sep 17 00:00:00 2001 From: yostyle Date: Wed, 10 Apr 2024 11:23:08 +0200 Subject: [PATCH] Fix conflicts --- towncrier.toml | 2 +- vector-app/build.gradle | 6 +----- vector-app/src/main/java/im/vector/app/VectorApplication.kt | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/towncrier.toml b/towncrier.toml index 4a9718be82..6920e8c358 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] - version = "2.11.0" + version = "2.11.1" directory = "changelog.d" filename = "TCHAP_CHANGES.md" name = "Changes in Tchap" diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 04f08635a3..532bfbf466 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -37,11 +37,7 @@ ext.versionMinor = 11 // Note: even values are reserved for regular release, odd values for hotfix release. // When creating a hotfix, you should decrease the value, since the current value // is the value for the next regular release. -<<<<<<< HEAD -ext.versionPatch = 0 -======= -ext.versionPatch = 14 ->>>>>>> v1.6.14 +ext.versionPatch = 1 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' diff --git a/vector-app/src/main/java/im/vector/app/VectorApplication.kt b/vector-app/src/main/java/im/vector/app/VectorApplication.kt index 20fb235edc..bd28938808 100644 --- a/vector-app/src/main/java/im/vector/app/VectorApplication.kt +++ b/vector-app/src/main/java/im/vector/app/VectorApplication.kt @@ -51,11 +51,8 @@ import im.vector.app.core.debug.LeakDetector import im.vector.app.core.di.ActiveSessionHolder import im.vector.app.core.pushers.FcmHelper import im.vector.app.core.resources.BuildMeta -<<<<<<< HEAD import im.vector.app.features.VectorFeatures -======= import im.vector.app.features.analytics.DecryptionFailureTracker ->>>>>>> v1.6.14 import im.vector.app.features.analytics.VectorAnalytics import im.vector.app.features.call.webrtc.WebRtcCallManager import im.vector.app.features.configuration.VectorConfiguration