code/IM
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'feature-nxdev' of https://gitea.nxsir.cn/code/IM into feature-nxdev

Browse Source
This commit is contained in:
nanxun
2026-03-18 21:48:47 +08:00
parent d1db5e6490 eb8455e141
commit 536b360127
14 changed files with 291 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfo.cs
+4
View File
@@ -14,7 +14,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("IMTest")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+eb8455e141ea496a2134ad7c7d9b759b6029dd75")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f7223dc5904286fdf8e117b56c37f58dc431d68b")]
>>>>>>> eb8455e141ea496a2134ad7c7d9b759b6029dd75
[assembly: System.Reflection.AssemblyProductAttribute("IMTest")]
[assembly: System.Reflection.AssemblyTitleAttribute("IMTest")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfoInputs.cache
+4
View File
@@ -1 +1,5 @@
<<<<<<< HEAD
546570633bb9288fc2957cbb29a807a45f3e48ba127ec13bc3956d28f5e6ed5b
=======
3c0a5335719f892c65744a9df7eae9fd7b12de9067131f5c9f4cb65f2b27b8d4
>>>>>>> eb8455e141ea496a2134ad7c7d9b759b6029dd75