From 472e8a78b173650ce8e6c842575b63ac8f4da372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 26 May 2023 14:39:57 +0200
Subject: [PATCH] Update tests.toml

---
 tests.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests.toml b/tests.toml
index 7148d35..cbdecd9 100644
--- a/tests.toml
+++ b/tests.toml
@@ -1,8 +1,5 @@
 test_format = 1.0
 
-<<<<<<< Updated upstream
-[default]
-=======
 [default]
 
     # -------------------------------
@@ -10,4 +7,3 @@ test_format = 1.0
     # -------------------------------
 
     args.admin="xana"
->>>>>>> Stashed changes