From 168e37ea43699ea11dd2e45c45e130a0d087c56e Mon Sep 17 00:00:00 2001
From: Alec Ananian <1013230+alecananian@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:18:51 -0700
Subject: [PATCH] fix merge conflicts

---
 Assets/Treasure/Plugins.meta                                  | 4 ----
 .../TDK/Runtime/Connect/Modals/TransitionModal.cs.meta        | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/Assets/Treasure/Plugins.meta b/Assets/Treasure/Plugins.meta
index 36211cb..e8ea80d 100644
--- a/Assets/Treasure/Plugins.meta
+++ b/Assets/Treasure/Plugins.meta
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Treasure/Plugins.meta
 guid: d5d8f06c2707d4b009ca9a41a9217393
-========
-guid: 27ad92363e0699e4da16db2e5f65b039
->>>>>>>> main:Assets/Thirdweb/Runtime/Unity/Http.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Treasure/TDK/Runtime/Connect/Modals/TransitionModal.cs.meta b/Assets/Treasure/TDK/Runtime/Connect/Modals/TransitionModal.cs.meta
index 831aaa1..9c47d99 100755
--- a/Assets/Treasure/TDK/Runtime/Connect/Modals/TransitionModal.cs.meta
+++ b/Assets/Treasure/TDK/Runtime/Connect/Modals/TransitionModal.cs.meta
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Treasure/TDK/Runtime/Connect/Modals/TransitionModal.cs.meta
 guid: a683fa303016e436eac455f8faa10efd
-========
-guid: 06841cde28862774ba2b2edb8b8b943b
->>>>>>>> main:Assets/Thirdweb/Runtime/Unity/Http/CrossPlatformUnityHttpClient.cs.meta
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2