mirror of https://github.com/m-labs/artiq.git
parent
d8597e9dc8
commit
48cb111035
|
@ -1,7 +0,0 @@
|
||||||
version: "1"
|
|
||||||
rules:
|
|
||||||
- base: master
|
|
||||||
upstream: m-labs:master
|
|
||||||
mergeMethod: merge
|
|
||||||
label: ":arrow_heading_down: pull"
|
|
||||||
conflictLabel: "merge-conflict"
|
|
Loading…
Reference in New Issue