From 36fec57c680b4833bd87d3d3f3492dd86a295a63 Mon Sep 17 00:00:00 2001
From: Mathias Mayrhofer <mtmayr@mtmayr.com>
Date: Sun, 18 Jul 2021 14:42:38 +0200
Subject: Meetup realraum

---
 inc/en/meetup.shtml  | 6 ++----
 inc/en/meetup.shtml~ | 9 +++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'inc/en')

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>
 -->
 
-- 
cgit v1.2.1