From 50344b4236e235fdd42997c1fe85f2c1bd014e47 Mon Sep 17 00:00:00 2001
From: Brian Kim <brian@tagg.id>
Date: Tue, 29 Jun 2021 23:04:22 +0900
Subject: Fixed up some merge issues

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e28fc214..09ed6fc5 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,8 @@
     "react-native-haptic-feedback": "^1.11.0",
     "react-native-hyperlink": "^0.0.19",
     "react-native-image-crop-picker": "^0.36.0",
-    "react-native-image-pan-zoom": "^2.1.12",
     "react-native-image-picker": "^4.0.4",
+    "react-native-image-pan-zoom": "^2.1.12",
     "react-native-image-resizer": "^1.4.4",
     "react-native-inappbrowser-reborn": "^3.5.0",
     "react-native-linear-gradient": "^2.5.6",
@@ -110,4 +110,4 @@
       "./node_modules/react-native-gesture-handler/jestSetup.js"
     ]
   }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2