Merge branch 'main' of https://gitea.nanami.tech/Nukumizu/numumizu-backend

2026-08-03 22:17:11 +08:00
parent 19b69acc29 b3a5a5bad1
commit 86a6736a48
1 changed files with 4 additions and 0 deletions
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Nukumizu Backend

 Remote server monitoring and command execution subsystem for [Komari](https://www.komari.wiki).
@@ -156,3 +157,6 @@ go build -o nukumizu-backend .
 ## License

 See [LICENSE](LICENSE).
+=======
+# nukumizu-backend
+>>>>>>> b3a5a5bad12c5ad7119d7b1b41134830233cdf67