mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-10-11 01:36:37 +08:00
chore(cordis): persist merge.ours and isolate wavelet extras
Add a repo .gitconfig so merge=ours in .gitattributes can actually run. Disable the Wavelet canary image workflow and keep docker-compose.yaml as the OpenFlare default so a merge cannot ship the wrong product.
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
# Upstream Wavelet stack. Not the OpenFlare default.
|
||||
# Use docker-compose.yaml (or `docker compose up`) for the product.
|
||||
services:
|
||||
wavelet:
|
||||
build:
|
||||
|
||||
Reference in New Issue
Block a user