nick/rfid-database
1
0
Fork 0
mirror of https://github.com/Chewbaccalakis/rfid-database.git synced 2026-09-10 00:11:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix leftover merge conflict markers in Docker files

Browse Source 
The previous merge commit accidentally retained <<<<<<< markers in
Dockerfile, README, and .env.example, which broke docker compose build.
This commit is contained in:
Cursor Agent
2026-08-23 23:28:17 +00:00
parent 4593052348
commit 924b889f76
3 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
-3
View File
@@ -2,7 +2,6 @@ AUTH_SECRET=change-me-to-a-long-random-string
# Optional: path to SQLite file (default ./data/rfid.db)
# RFID_DB_PATH=./data/rfid.db
<<<<<<< HEAD
# Docker Compose published port (default 3000)
# RFID_PORT=3000
@@ -11,8 +10,6 @@ AUTH_SECRET=change-me-to-a-long-random-string
# CREATE_USER_PASSWORD=changeme
# CREATE_USER_NAME=Admin
=======
>>>>>>> origin/main
# Optional OIDC (Authentik, Keycloak, Authelia, etc.)
# AUTH_OIDC_ISSUER=https://sso.example.com/application/o/rfid/
# AUTH_OIDC_CLIENT_ID=