From 8a536cd522ec44ea8d65141d113aa20e14fea236 Mon Sep 17 00:00:00 2001
From: Gilles Boccon-Gibod <bok@bok.net>
Date: Mon, 6 Nov 2023 19:20:23 -0800
Subject: [PATCH] fix missed merge

---
 extras/android/RemoteHCI/gradle/libs.versions.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extras/android/RemoteHCI/gradle/libs.versions.toml b/extras/android/RemoteHCI/gradle/libs.versions.toml
index 1350f22c..a9f80cf9 100644
--- a/extras/android/RemoteHCI/gradle/libs.versions.toml
+++ b/extras/android/RemoteHCI/gradle/libs.versions.toml
@@ -1,9 +1,5 @@
 [versions]
-<<<<<<< HEAD
 agp = "8.3.0-alpha11"
-=======
-agp = "8.3.0-alpha10"
->>>>>>> fd85fd8 (wip)
 kotlin = "1.8.10"
 core-ktx = "1.9.0"
 junit = "4.13.2"