summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeandra Eberle <lea@ccczh.ch>2016-11-26 16:34:45 +0100
committerLeandra Eberle <lea@ccczh.ch>2016-11-26 16:34:45 +0100
commitd6d049a31cb0ce481ef1d5f152ed32d128e11bd3 (patch)
tree0503f72fcdca5d814015556e72231069d9e79714
parent10517213f6b6391721af36ccf99c3d0db8762966 (diff)
parent6ad204d8e285aa0c401966165b06648f1c51d854 (diff)
Merge branch 'master' of https://github.com/leaneb/engelsystem
-rw-r--r--.idea/vcs.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
- </component>
-</project> \ No newline at end of file