gpicchiarelli
diff --git a/‎AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.dll
512 Bytes b/‎AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.dll
512 Bytes
diff --git a/‎AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.exe
2 KB b/‎AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.exe
2 KB
diff --git a/‎AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.pdb
52 Bytes b/‎AccordaGUItar/bin/Debug/net8.0-windows7.0/AccordaGUItar.pdb
52 Bytes
diff --git a/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfo.cs
Lines changed: 1 addition & 5 deletions b/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfo.cs
Lines changed: 1 addition & 5 deletions
diff --git a/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfoInputs.cache
Lines changed: 1 addition & 5 deletions b/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfoInputs.cache
Lines changed: 1 addition & 5 deletions
diff --git a/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.GeneratedMSBuildEditorConfig.editorconfig
Lines changed: 1 addition & 1 deletion b/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.GeneratedMSBuildEditorConfig.editorconfig
Lines changed: 1 addition & 1 deletion
diff --git a/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.assets.cache
11.3 KB b/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.assets.cache
11.3 KB
diff --git a/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.baml
407 Bytes b/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.baml
407 Bytes
diff --git a/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.csproj.AssemblyReference.cache
4.75 KB b/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.csproj.AssemblyReference.cache
4.75 KB
diff --git a/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.csproj.CoreCompileInputs.cache
Lines changed: 1 addition & 1 deletion b/‎AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.csproj.CoreCompileInputs.cache
Lines changed: 1 addition & 1 deletion
@@ -13,11 +13,7 @@
 [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.AssemblyInformationalVersionAttribute("1.0.0+52aa19f4fe51a511fd61880edb96c0d35d8b9419")]
 [assembly: System.Reflection.AssemblyProductAttribute("AccordaGUItar")]
 [assembly: System.Reflection.AssemblyTitleAttribute("AccordaGUItar")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 
@@ -1,5 +1 @@
-<<<<<<< HEAD
-481f933f9187a26a9949751df663ba97fd123adf0906de26b98b5856c4503991
-=======
-dcaa8bf8a8bbab77eb99a6e4f878696a2df76590c25b6f6af55ee10eba8d5139
->>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
+56d9a6281887904b85883a6b49b23e3d396dcea5f3c2131141adf79921f15fb4
@@ -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\gpicc\source\repos\accorda\AccordaGUItar\
+build_property.ProjectDir = C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
@@ -1 +1 @@
-d3e3a9007f87bbc6c70fe2139a1f4f338153c9efa9b1c2b3da78819695db0cec
+e25ca234aea3a97aedc0e241305bcb0dba4e19d36ff116d7c5e13ea0dca9c8cf
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-d3e3a9007f87bbc6c70fe2139a1f4f338153c9efa9b1c2b3da78819695db0cec`
	`1`	`+e25ca234aea3a97aedc0e241305bcb0dba4e19d36ff116d7c5e13ea0dca9c8cf`