fix: resolve merge conflict in README.md
This commit is contained in:
1 parent
86a6736a48
commit
c25b267334
1 file changed
+1
-5
@@ -1,4 +1,3 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
# Nukumizu Backend
|
# Nukumizu Backend
|
||||||
|
|
||||||
Remote server monitoring and command execution subsystem for [Komari](https://www.komari.wiki).
|
Remote server monitoring and command execution subsystem for [Komari](https://www.komari.wiki).
|
||||||
@@ -156,7 +155,4 @@ go build -o nukumizu-backend .
|
|||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
See [LICENSE](LICENSE).
|
See [LICENSE](LICENSE).
|
||||||
=======
|
|
||||||
# nukumizu-backend
|
|
||||||
>>>>>>> b3a5a5bad12c5ad7119d7b1b41134830233cdf67
|
|
||||||
Reference in new issue
Block a user