mirror of
https://github.com/juanfont/headscale
synced 2026-04-25 17:15:33 +02:00
Resolve merge conflict
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
// ignoring it let us speed up the integration test
|
||||
// development
|
||||
integration_test.go
|
||||
integration_test/
|
||||
|
||||
Dockerfile*
|
||||
docker-compose*
|
||||
|
||||
Reference in New Issue
Block a user