From 2fe2ad30b04c6292a23833a49bfd018070b004d4 Mon Sep 17 00:00:00 2001
From: Oscar Suescun Elizalde <osuescuneli@unav.es>
Date: Wed, 28 May 2025 15:24:08 +0200
Subject: [PATCH] as

---
 src/funcionesSimELectrica.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/funcionesSimELectrica.py b/src/funcionesSimELectrica.py
index 01fd479..e148866 100644
--- a/src/funcionesSimELectrica.py
+++ b/src/funcionesSimELectrica.py
@@ -125,13 +125,9 @@ def simular_LTS(tensionCap, Rtotal, Lbobina, Ctotal, lts_path, tSim = 100e-3, to
         
 if __name__ == '__main__':
 
-<<<<<<< HEAD
     import matplotlib.pyplot as plt
 
     lts_path = "C:/Users/osuescuneli/AppData/Local/Programs/ADI/LTspice/LTspice.exe"
-=======
-    lts_path = "D:\\Appdata\\LTSpice\\LTSPice.exe"
->>>>>>> a2d05aa067ff48217660c219d56c5865db470197
 
     Tension = 300
     Resistencia = 10