Resolved merge conflicts

This commit is contained in:
Din Dang
2024-11-28 17:49:35 +08:00
parent f4ddf390ce
commit f6ac22ee8d
2 changed files with 2 additions and 2 deletions
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("ResourceMonitorService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+05d805be0a5e626221a4a3e9dcddf03ed98f19df")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ba0db6daf8300ebe8b0a09f5a347bfb66fad348a")]
[assembly: System.Reflection.AssemblyProductAttribute("ResourceMonitorService")]
[assembly: System.Reflection.AssemblyTitleAttribute("ResourceMonitorService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
@@ -1 +1 @@
0809520ec06e4bef48e22da36f3b13b9e8edb0d7b56ed5d55250e30c1c30ba16
6bed2d3a161c18764cbb71b5911fb15b70f2ac9349cf50113176636c2370d07f