bajo cambios 20012024a

2024-01-21 19:00:46 -07:00
parent bf7c56787f 53dd047ba9
commit 86e299c533
3 changed files with 100 additions and 53 deletions
@@ -2,6 +2,10 @@
  "ExpandedNodes": [
    ""
  ],
+<<<<<<< HEAD
  "SelectedNode": "\\agregarmermas.cs",
+=======
+  "SelectedNode": "\\vender.cs",
+>>>>>>> 53dd047ba99d9fe2f8dc36472f5d1441d992e695
  "PreviewInSolutionExplorer": false
 }