From d7833b3752b2672808d4fb8ecdcdca92bcdc6dbc Mon Sep 17 00:00:00 2001
From: Marko Oldenburg <leongaultier@gmail.com>
Date: Thu, 29 Oct 2015 09:22:54 +0100
Subject: [PATCH] Rechtschreibfehler verbessert, Version 0.8.0

---
 74_AMAD.pm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/74_AMAD.pm b/74_AMAD.pm
index f0a3efe..9125dc1 100644
--- a/74_AMAD.pm
+++ b/74_AMAD.pm
@@ -35,11 +35,7 @@ use Time::HiRes qw(gettimeofday);
 use HttpUtils;
 use TcpServerUtils;
 
-<<<<<<< HEAD
-my $version = "0.6.3";
-=======
 my $version = "0.8.0";
->>>>>>> devel
 
 
 
@@ -94,15 +90,11 @@ sub AMAD_Define($$) {
     if( ! $hash->{HOST} ) {
 	return "there is already a AMAD Bridge" if( $modules{AMAD}{defptr}{BRIDGE} );
 
-<<<<<<< HEAD
-    Log3 $name, 3, "AMAD ($name) - defined with host $hash->{HOST} on port $hash->{PORT} and interval $hash->{INTERVAL} (sec)";
-=======
 	$hash->{BRIDGE} = 1;
 	$modules{AMAD}{defptr}{BRIDGE} = $hash;
 	$attr{$name}{room} = "AMAD";
 	Log3 $name, 3, "AMAD ($name) - defined Bridge with Socketport $hash->{PORT}";
 	AMAD_CommBridge_Open( $hash );
->>>>>>> devel
 
     } else {
 	if( ! $modules{AMAD}{defptr}{BRIDGE} && $init_done ) {