summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/en/meetup.shtml~28
-rw-r--r--inc/si/meetup.shtml~26
2 files changed, 0 insertions, 54 deletions
diff --git a/inc/en/meetup.shtml~ b/inc/en/meetup.shtml~
deleted file mode 100644
index 4b0d42a..0000000
--- a/inc/en/meetup.shtml~
+++ /dev/null
@@ -1,28 +0,0 @@
-<div id="meetup">
-<h1>Next Meet-Up</h1>
-<p>
- Monday, <em><!--#include virtual="/meetup/next.html" --></em> at <em><!--#include virtual="/meetup/nextbegin.html" --></em><br />
-
-<<<<<<< HEAD
- online in this <a href="https://bbb.freirad.at/b/mat-2hq-mhd">forum/videochat</a>
-
-<!--
-=======
- in the pub garden of <a href="http://www.eschenlaube.at/">Eschenlaube</a>.
-
-<!--
- online in this <a href="https://bbb.freirad.at/b/mat-2hq-mhd">forum/videochat</a>
--->
-<!--
->>>>>>> 47767aa5858f2cc55e797ae8e363a3076f59de7d
- at <a href="https://realraum.at/wiki/doku.php">realraum</a>, <a href="https://map.project-osrm.org/?dest=47.06555,15.45050&amp;destname=realraum"> Brockmanngasse 15</a>
--->
-
- <br /><br />
- Next planned meet-ups will be on:
-</p>
-<!--#include virtual="/meetup/after.html" -->
-<p>
- Further Information can be found at our <a href="https://wiki.graz.funkfeuer.at/Treffen">Wiki</a>.
-</p>
-</div>
diff --git a/inc/si/meetup.shtml~ b/inc/si/meetup.shtml~
deleted file mode 100644
index 870834b..0000000
--- a/inc/si/meetup.shtml~
+++ /dev/null
@@ -1,26 +0,0 @@
-<div id="meetup">
-<h1>Naslednje srečanje</h1>
-<p>
- Ponedeljek, <em><!--#include virtual="/meetup/next.html" --></em> ob <em><!--#include virtual="/meetup/nextbegin.html" --></em><br />
-
-<<<<<<< HEAD
- v tem <a href="https://bbb.freirad.at/b/mat-2hq-mhd">forumu video klepet</a>
-
-=======
-
- na vrtu <a href="http://www.eschenlaube.at/">Eschenlaube</a>.
-<!--
- v tem <a href="https://bbb.freirad.at/b/mat-2hq-mhd">forumu video klepet</a>
--->
->>>>>>> 47767aa5858f2cc55e797ae8e363a3076f59de7d
-<!--
- v <a href="https://realraum.at/wiki/doku.php">realraumu</a>, <a href="https://map.project-osrm.org/?dest=47.06555,15.45050&amp;destname=realraum"> Brockmanngasse 15</a>
--->
- <br /><br />
- Predvidena srečanja:
-</p>
-<!--#include virtual="/meetup/after.html" -->
-<p>
- Več informacij lahko najdeš na <a href="https://wiki.graz.funkfeuer.at/Treffen">wikiju (po nemško)</a>.
-</p>
-</div>