serversdown/terra-view
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix: merge conflict fixed

Browse Source
This commit is contained in:
serversdown
2026-03-12 21:37:09 +00:00
parent fbf7f2a65d
commit 61c84bc71d
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose.yml
View File

@@ -22,10 +22,7 @@ services:
retries: 3 retries: 3
start_period: 40s start_period: 40s
<<<<<<< HEAD
=======
# --- SLMM (Sound Level Meter Manager) --- # --- SLMM (Sound Level Meter Manager) ---
>>>>>>> 0c2186f5d89d948b0357d674c0773a67a67d8027
slmm: slmm:
build: build:
context: ../slmm context: ../slmm