diff options
| author | Mathias Mayrhofer <mtmayr@mtmayr.com> | 2021-07-18 14:42:38 +0200 |
|---|---|---|
| committer | Mathias Mayrhofer <mtmayr@mtmayr.com> | 2021-07-18 14:42:38 +0200 |
| commit | 36fec57c680b4833bd87d3d3f3492dd86a295a63 (patch) | |
| tree | 8721dc5b810a9b8dc759cb061ea33281445cbfb0 /inc/si | |
| parent | 47767aa5858f2cc55e797ae8e363a3076f59de7d (diff) | |
Meetup realraum
Diffstat (limited to 'inc/si')
| -rw-r--r-- | inc/si/meetup.shtml | 9 | ||||
| -rw-r--r-- | inc/si/meetup.shtml~ | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/inc/si/meetup.shtml b/inc/si/meetup.shtml index e7c7511..187f520 100644 --- a/inc/si/meetup.shtml +++ b/inc/si/meetup.shtml @@ -3,14 +3,13 @@ <p>
Ponedeljek, <em><!--#include virtual="/meetup/next.html" --></em> ob <em><!--#include virtual="/meetup/nextbegin.html" --></em><br />
-
- 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>
--->
-<!--
- 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>
+ na vrtu <a href="http://www.eschenlaube.at/">Eschenlaube</a>.
-->
+
+ 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>
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>
-->
|