5 files changed, 25 insertions, 13 deletions
diff --git a/inc/de/meetup.shtml b/inc/de/meetup.shtml
index 2418514..12c299f 100644
--- a/inc/de/meetup.shtml
+++ b/inc/de/meetup.shtml
@@ -3,14 +3,12 @@
 <p>
   Montag, <em><!--#include virtual="/meetup/next.html" --></em> ab <em><!--#include virtual="/meetup/nextbegin.html" --> Uhr</em><br />
 
-
-  im Gastgarten der <a href="http://www.eschenlaube.at/">Eschenlaube</a>.
 <!--
   online in diesem <a href="https://bbb.freirad.at/b/mat-2hq-mhd">Forum/Videochat</a>
+  im Gastgarten der <a href="http://www.eschenlaube.at/">Eschenlaube</a>.
 -->
-<!--
+
   im <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 />
   Vorgesehene kommende Termine:
diff --git a/inc/en/meetup.shtml b/inc/en/meetup.shtml
index d3ee6c9..126b911 100644
--- a/inc/en/meetup.shtml
+++ b/inc/en/meetup.shtml
@@ -3,14 +3,12 @@
 <p>
   Monday, <em><!--#include virtual="/meetup/next.html" --></em> at <em><!--#include virtual="/meetup/nextbegin.html" --></em><br />
 
-  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>
+  in the pub garden of <a href="http://www.eschenlaube.at/">Eschenlaube</a>.
 -->
-<!--
+
   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:
diff --git a/inc/en/meetup.shtml~ b/inc/en/meetup.shtml~
index 57a580a..4b0d42a 100644
--- a/inc/en/meetup.shtml~
+++ b/inc/en/meetup.shtml~
@@ -3,9 +3,18 @@
 <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>
 -->
 
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&amp;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&amp;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&amp;destname=realraum"> Brockmanngasse 15</a>
 -->