From 3a82151d8dcc36486462466607b66add948f9188 Mon Sep 17 00:00:00 2001
From: Developer <dev@bilibili-app.local>
Date: Tue, 24 Mar 2026 00:22:30 +0800
Subject: [PATCH] 1

---
 app.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app.json b/app.json
index 9be8717..8ac1444 100644
--- a/app.json
+++ b/app.json
@@ -1,13 +1,8 @@
 {
   "expo": {
     "name": "JKVideo",
-<<<<<<< HEAD
     "slug": "jsvideo",
     "version": "1.0.5",
-=======
-    "slug": "jkvideo",
-    "version": "1.0.6",
->>>>>>> 21d9df01566df104c004ce5c63218a7ccfc7e8e1
     "scheme": "bilibili",
     "orientation": "default",
     "icon": "./assets/icon.png",