From c1145fc0ffbc4973585b98eceed6641ae46d3e70 Mon Sep 17 00:00:00 2001
From: amalcaraz <amalcaraz89@gmail.com>
Date: Wed, 12 Jul 2023 14:03:46 +0200
Subject: [PATCH] updated gitignore

---
 .gitignore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1285bafd..3fdddcab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,13 +106,13 @@ dist
 
 # Custom
 .idea
-<<<<<<< HEAD
 
 # Ephemeral Account
 tests/testAccount/ephemeralAccount.json
 
 # Documentation
 docs/
-=======
 .gitsigners
->>>>>>> 1108692 (add .gitsigners to .gitignore, containing some signing key)
+
+
+.DS_Store
\ No newline at end of file