diff options
Diffstat (limited to 'inc/si/meetup.shtml~')
-rw-r--r-- | inc/si/meetup.shtml~ | 26 |
1 files changed, 0 insertions, 26 deletions
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&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>
|