cuenta hecha

2024-01-22 15:47:46 -06:00
parent 2db5006ebb
commit 56afdda99a
17 changed files with 195 additions and 25 deletions
@@ -5,10 +5,6 @@
    "\\Properties",
    "\\Properties\\DataSources"
  ],
-<<<<<<< HEAD
  "SelectedNode": "\\envios.cs",
-=======
-  "SelectedNode": "\\database\\DAO.cs",
->>>>>>> 3d33ff1e16cc8960f815f7a70dbce03e3275ec89
  "PreviewInSolutionExplorer": false
 }