32 lines
1.4 KiB
Plaintext
32 lines
1.4 KiB
Plaintext
{
|
|
"version": 2,
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
|
|
"success": true,
|
|
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
|
=======
|
|
"dgSpecHash": "LNnYsLsyYVQ4fuL9pNFk9cO8Boe/+luXWUaSQqclJgBskwz1g0BEBYEIZmCiL8av7FykKX2WDu3pRy0mom6AAg==",
|
|
"success": true,
|
|
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
|
>>>>>>> 88e614d (god)
|
|
=======
|
|
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
|
|
"success": true,
|
|
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
|
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
|
=======
|
|
"dgSpecHash": "+fAmxvUxzXFJdL6cjwnLzpFPUy6kbZ77RHAmwP73fYrskGO9Qznx7rWzPtjjeDphCNfQ5J+s1nW7KRZF6IabWg==",
|
|
"success": true,
|
|
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
|
|
>>>>>>> 855ce7c (AAAAAAAAAAA)
|
|
=======
|
|
"dgSpecHash": "2CEPFq1aFcIXpBNXKJ0FYOgrgWTNW9/4khhso/sBmLj3P4gKEyjLHCUpPCPGpCybn7OaowLBWRaR35Uqo6RHKQ==",
|
|
"success": true,
|
|
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
|
|
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
|
|
"expectedPackageFiles": [],
|
|
"logs": []
|
|
} |