Skip to content

Commit 60ea907

Browse files
committed
Allineamento file di compilazione.
1 parent 52aa19f commit 60ea907

38 files changed

+122
-71
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.

AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.AssemblyInfo.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
[assembly: System.Reflection.AssemblyCompanyAttribute("AccordaGUItar")]
1414
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
1515
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
16-
<<<<<<< HEAD
17-
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+97944d7f26be4d0da2210b9349167247074d26ad")]
18-
=======
19-
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8234b0b7cf8aed43f7ee4d347cadd3a7a3aec123")]
20-
>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
16+
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+52aa19f4fe51a511fd61880edb96c0d35d8b9419")]
2117
[assembly: System.Reflection.AssemblyProductAttribute("AccordaGUItar")]
2218
[assembly: System.Reflection.AssemblyTitleAttribute("AccordaGUItar")]
2319
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
481f933f9187a26a9949751df663ba97fd123adf0906de26b98b5856c4503991
3-
=======
4-
dcaa8bf8a8bbab77eb99a6e4f878696a2df76590c25b6f6af55ee10eba8d5139
5-
>>>>>>> 01f9ad862716b6557552d2da95db35a3ea0e0e8c
1+
56d9a6281887904b85883a6b49b23e3d396dcea5f3c2131141adf79921f15fb4

AccordaGUItar/obj/Debug/net8.0-windows7.0/AccordaGUItar.GeneratedMSBuildEditorConfig.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly =
88
build_property.EnforceExtendedAnalyzerRules =
99
build_property._SupportedPlatformList = Linux,macOS,Windows
1010
build_property.RootNamespace = AccordaGUItar
11-
build_property.ProjectDir = C:\Users\gpicc\source\repos\accorda\AccordaGUItar\
11+
build_property.ProjectDir = C:\Users\Giacomo\source\repos\accorda\AccordaGUItar\
1212
build_property.EnableComHosting =
1313
build_property.EnableGeneratedComInterfaceComImportInterop =
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d3e3a9007f87bbc6c70fe2139a1f4f338153c9efa9b1c2b3da78819695db0cec
1+
e25ca234aea3a97aedc0e241305bcb0dba4e19d36ff116d7c5e13ea0dca9c8cf

0 commit comments

Comments
 (0)