summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-05-31 09:13:55 -0300
committerRenato Botelho <renato@netgate.com>2016-05-31 09:13:55 -0300
commit960cb0ff45995917722a6dab89c593ddaa6789b9 (patch)
treed46ac2f1723fc1b08bba79600136d4b0146a7d81
parent13a70e7d4eef151b80dcdc2567486209a6bd5312 (diff)
downloadpfsense-960cb0ff45995917722a6dab89c593ddaa6789b9.zip
pfsense-960cb0ff45995917722a6dab89c593ddaa6789b9.tar.gz
Remove /root/.gitsync_merge.sample
-rw-r--r--src/root/.gitsync_merge.sample3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/root/.gitsync_merge.sample b/src/root/.gitsync_merge.sample
deleted file mode 100644
index 1c2606c..0000000
--- a/src/root/.gitsync_merge.sample
+++ /dev/null
@@ -1,3 +0,0 @@
-# Sample automatic merge list for gitsync
-# gitsync will automatically merge anything listed in /root/.gitsync_merge
-http://repositorysite/my_repository.git my_branch
OpenPOWER on IntegriCloud