Merge branches 'main' and 'main' of https://github.com/gpicchiarelli/accorda

gpicchiarelli · gpicchiarelli · commit 52aa19f4fe51 · 2024-02-06T18:28:58.000+01:00
diff --git a/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfo.cs b/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfo.cs
@@ -13,7 +13,11 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("AccordaGUItar")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+<<<<<<< HEAD
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+97944d7f26be4d0da2210b9349167247074d26ad")]
+=======
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8234b0b7cf8aed43f7ee4d347cadd3a7a3aec123")]
+>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
 [assembly: System.Reflection.AssemblyProductAttribute("AccordaGUItar")]
 [assembly: System.Reflection.AssemblyTitleAttribute("AccordaGUItar")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfoInputs.cache b/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfoInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
 481f933f9187a26a9949751df663ba97fd123adf0906de26b98b5856c4503991
+=======
+dcaa8bf8a8bbab77eb99a6e4f878696a2df76590c25b6f6af55ee10eba8d5139
+>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
diff --git a/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.GeneratedMSBuildEditorConfig.editorconfig b/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = AccordaGUItar
-build_property.ProjectDir = C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\
+build_property.ProjectDir = C:\Users\gpicc\source\repos\accorda\AccordaGUItar\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
diff --git a/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.assets.cache b/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.assets.cache
diff --git a/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.csproj.AssemblyReference.cache b/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.csproj.AssemblyReference.cache
diff --git a/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar_MarkupCompile.i.cache b/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar_MarkupCompile.i.cache
@@ -4,16 +4,20 @@
 winexe
 C#
 .cs
-C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\obj\Debug\net8.0-windows7.0\
+C:\Users\gpicc\source\repos\accorda\AccordaGUItar\obj\Debug\net8.0-windows7.0\
 AccordaGUItar
 none
 false
 TRACE;DEBUG;NET;NET8_0;NETCOREAPP
-C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\App.xaml
+C:\Users\gpicc\source\repos\accorda\AccordaGUItar\App.xaml
 1-1812784380
 
 8-1335952047
+<<<<<<< HEAD
+218187268512
+=======
 218-1432647240
+>>>>>>> 97944d7f26be4d0da2210b9349167247074d26ad
 AccordaGUItar.xaml;
 
 False
diff --git a/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar_MarkupCompile.i.lref b/AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar_MarkupCompile.i.lref
@@ -0,0 +1,7 @@
+﻿
+<<<<<<< HEAD
+FC:\Users\gpicc\source\repos\accorda\AccordaGUItar\App.xaml;;
+=======
+FC:\Users\Giacomo\source\repos\accorda\AccordaGUItar\App.xaml;;
+>>>>>>> 97944d7f26be4d0da2210b9349167247074d26ad
+
diff --git a/AccordaGUItar/obj/Debug/net8.0-windows7.0/App.g.i.cs b/AccordaGUItar/obj/Debug/net8.0-windows7.0/App.g.i.cs
@@ -1,4 +1,4 @@
-﻿#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6890181222E7A3B7BB557A0AEE2A6D94F0690A8E"
+﻿#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9D93C5DB3FA77968BDA7E1E14F12D4BF74377CFD"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Il codice è stato generato da uno strumento.
diff --git a/AccordaGUItar/obj/project.nuget.cache b/AccordaGUItar/obj/project.nuget.cache
@@ -1,6 +1,10 @@
 {
   "version": 2,
+<<<<<<< HEAD
+  "dgSpecHash": "xluSHpvtHjGik/7sJUGPVpPtnFtVeX8KtrixkWfhFrh8OEN7x3oNv1ovFe1ACsRPCfuYIZNfo6IBD2zsSajKbA==",
+=======
   "dgSpecHash": "nVuFMlWtLC+BAoAldXm+0R4MtV9yrYfaeL4w0qck6IvRrJOUB1+xIXs26Nz/aiJCzhlBqs5y5KBLDR/N9iIjWA==",
+>>>>>>> 97944d7f26be4d0da2210b9349167247074d26ad
   "success": true,
   "projectFilePath": "C:\\Users\\Giacomo\\source\\repos\\accorda\\AccordaGUItar\\AccordaGUItar.csproj",
   "expectedPackageFiles": [
diff --git a/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.AssemblyInfo.cs b/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.AssemblyInfo.cs
@@ -13,7 +13,11 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("Accorda")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
+<<<<<<< HEAD
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+97944d7f26be4d0da2210b9349167247074d26ad")]
+=======
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8234b0b7cf8aed43f7ee4d347cadd3a7a3aec123")]
+>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
 [assembly: System.Reflection.AssemblyProductAttribute("Accorda")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Accorda")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.AssemblyInfoInputs.cache b/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.AssemblyInfoInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
 68668204ac7feb54c7463f3d3613259d64dc7a58f1fb6d581f9acf883a22f0e1
+=======
+194dfe9904e1fd2448b0cb1d4f79ae3fc4e5a10cd2cd6c3eef1d2af4cc5a4ebf
+>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
diff --git a/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.GeneratedMSBuildEditorConfig.editorconfig b/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.GeneratedMSBuildEditorConfig.editorconfig
@@ -14,6 +14,6 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Accorda
-build_property.ProjectDir = C:\Users\Giacomo\source\repos\accorda\accorda.net\
+build_property.ProjectDir = C:\Users\gpicc\source\repos\accorda\accorda.net\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
diff --git a/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.assets.cache b/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.assets.cache
diff --git a/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.csproj.AssemblyReference.cache b/accorda.net/obj/Debug/net8.0-windows7.0/Accorda.csproj.AssemblyReference.cache
diff --git a/accorda.net/obj/project.nuget.cache b/accorda.net/obj/project.nuget.cache
@@ -1,6 +1,10 @@
 {
   "version": 2,
+<<<<<<< HEAD
+  "dgSpecHash": "KKGBiebaeH2MAKW6HEI40I8kySxn8UeTZI3ldOR7zKPpwZ8cl6otNElUDxLsjFlE9tB/FHE6l/am+CDNncp+IQ==",
+=======
   "dgSpecHash": "776M7A8f8vYXlKeWkFTNUe9STV175YMOsTrYYolBnvwUefocd/1AS/JsNHCF5R2ACShyDzUU93PGORbApQKFWQ==",
+>>>>>>> 97944d7f26be4d0da2210b9349167247074d26ad
   "success": true,
   "projectFilePath": "C:\\Users\\Giacomo\\source\\repos\\accorda\\accorda.net\\Accorda.csproj",
   "expectedPackageFiles": [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6890181222E7A3B7BB557A0AEE2A6D94F0690A8E"`
	`1`	`+#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9D93C5DB3FA77968BDA7E1E14F12D4BF74377CFD"`
`2`	`2`	`//------------------------------------------------------------------------------`
`3`	`3`	`// <auto-generated>`
`4`	`4`	`// Il codice è stato generato da uno strumento.`