diff options
Diffstat (limited to 'inc/si/meetup.shtml~')
| -rw-r--r-- | inc/si/meetup.shtml~ | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/inc/si/meetup.shtml~ b/inc/si/meetup.shtml~ index e3c265f..870834b 100644 --- a/inc/si/meetup.shtml~ +++ b/inc/si/meetup.shtml~ @@ -3,8 +3,16 @@ <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>
-->
|