summaryrefslogtreecommitdiff
path: root/conf/.gitignore
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-07-08 01:06:12 -0300
committerJesusaves <cpntb1@ymail.com>2021-07-08 01:06:12 -0300
commit235e3ff538e208eac63acf54f6e1cb2e23591350 (patch)
tree30c29e9577a533c3f275dafafc8befde39a00c29 /conf/.gitignore
parent6967b9e0b63d19141d4f59b7933a960ac81916d0 (diff)
downloadserverdata-235e3ff538e208eac63acf54f6e1cb2e23591350.tar.gz
serverdata-235e3ff538e208eac63acf54f6e1cb2e23591350.tar.bz2
serverdata-235e3ff538e208eac63acf54f6e1cb2e23591350.tar.xz
serverdata-235e3ff538e208eac63acf54f6e1cb2e23591350.zip
Manual tweaks for the git history merge.
Diffstat (limited to 'conf/.gitignore')
-rw-r--r--conf/.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/.gitignore b/conf/.gitignore
deleted file mode 100644
index 2c43e911..00000000
--- a/conf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*_local.conf