descargo detalles1

2024-01-22 17:53:17 -07:00
parent fdaf39957e 010f91469a
commit 1354690776
15 changed files with 197 additions and 12 deletions
@@ -2,6 +2,10 @@
  "ExpandedNodes": [
    ""
  ],
+<<<<<<< HEAD
  "SelectedNode": "\\Solution.sln",
+=======
+  "SelectedNode": "\\envios.cs",
+>>>>>>> 010f91469a9ca650f92e32a39a66a4e1428f5b62
  "PreviewInSolutionExplorer": false
 }