databus-systems
diff --git a/‎.drone.yml‎ b/‎.drone.yml‎
diff --git a/‎.drone.yml.sig‎ b/‎.drone.yml.sig‎
diff --git a/‎.gitattributes‎
Lines changed: 2 additions & 0 deletions b/‎.gitattributes‎
Lines changed: 2 additions & 0 deletions
@@ -0,0 +1,2 @@
+.drone.yml merge=ours
+.drone.yml.sig merge=ours
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+.drone.yml merge=ours`
	`2`	`+.drone.yml.sig merge=ours`