summaryrefslogtreecommitdiff
path: root/Wunschliste/Naehmaschine/index.mdwn
diff options
context:
space:
mode:
authorPhilipp Wollschlegel <folken@kabelsalat.ch>2013-12-16 21:38:50 +0100
committerPhilipp Wollschlegel <folken@kabelsalat.ch>2013-12-16 21:38:50 +0100
commit50f465d9ffa9afe4cb40615e0425980adc9a1b42 (patch)
tree9b2f8bdcff9adbc7e4632ae4e08700950d033006 /Wunschliste/Naehmaschine/index.mdwn
parent1ad93d874fc3bd97abc077ade91ae9e2c0f40cb8 (diff)
parente5b1dfe9420c5ec1d6a36261004ba669144b5195 (diff)
Merge branch 'master' of git+ssh://www-static.zrh.internetputzen.com/home/www/wiki.starship-factory.ch/wiki
Conflicts: index.mdwn
Diffstat (limited to 'Wunschliste/Naehmaschine/index.mdwn')
-rw-r--r--Wunschliste/Naehmaschine/index.mdwn3
1 files changed, 0 insertions, 3 deletions
diff --git a/Wunschliste/Naehmaschine/index.mdwn b/Wunschliste/Naehmaschine/index.mdwn
deleted file mode 100644
index 086315d6..00000000
--- a/Wunschliste/Naehmaschine/index.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta title="Nähmaschine"]]
-
-Juliane hat eine über.