fix: <<<<head nightmare

2024-08-04 22:08:37 +01:00
parent f0a0f53765
commit f023ce3b2d
25 changed files with 0 additions and 179 deletions
--- a/Backup.csproj.user
+++ b/Backup.csproj.user
@@ -7,12 +7,9 @@
    <Compile Update="AddProducto.cs">
      <SubType>Form</SubType>
    </Compile>
-<<<<<<< HEAD
    <Compile Update="FrmFacturas.cs">
      <SubType>Form</SubType>
    </Compile>
-=======
->>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02
    <Compile Update="FrmInforme.cs">
      <SubType>Form</SubType>
    </Compile>