summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Hoff <marcus.hoff@ring2.dk>2020-08-27 14:01:41 +0200
committerMarcus Hoff <marcus.hoff@ring2.dk>2020-08-27 14:01:41 +0200
commit0377b8e40b0d3e424da11194e97659c5066c0a1d (patch)
tree092aea663e236ba79a46f6eb98c84be17e5e5a54
parent632b3693097f665464d3072da138eb9a7e370309 (diff)
downloadvyos-1x-0377b8e40b0d3e424da11194e97659c5066c0a1d.tar.gz
vyos-1x-0377b8e40b0d3e424da11194e97659c5066c0a1d.zip
Automatic PR from upstream
-rw-r--r--.github/pull.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/.github/pull.yml b/.github/pull.yml
new file mode 100644
index 000000000..8238ed5df
--- /dev/null
+++ b/.github/pull.yml
@@ -0,0 +1,5 @@
+version: "1"
+rules:
+ - base: current
+ upstream: vyos:current # change `wei` to the owner of upstream repo
+ mergeMethod: hardreset