descargo detalles

2024-01-22 17:52:04 -07:00
parent 29c502b923
commit fdaf39957e
3 changed files with 2 additions and 9 deletions
@@ -1,14 +1,7 @@
 {
  "ExpandedNodes": [
-    "",
+    ""
    "\\database",
    "\\Properties",
    "\\Properties\\DataSources"
  ],
-<<<<<<< HEAD
+  "SelectedNode": "\\Solution.sln",
  "SelectedNode": "\\envios.cs",
 =======
  "SelectedNode": "\\database\\DAO.cs",
 >>>>>>> 3d33ff1e16cc8960f815f7a70dbce03e3275ec89
  "PreviewInSolutionExplorer": false
 }