From 065ba6c309db989de9f3dc4708ed920d8ca98c9e Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Wed, 16 Nov 2016 12:02:08 +0100
Subject: [PATCH] Erste IFrame Version der Karten eingebaut.
---
resources/views/metager3.blade.php | 3 ---
resources/views/metager3results.blade.php | 3 ---
2 files changed, 6 deletions(-)
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 9d1b1ecc1..4d1e78cfe 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -32,15 +32,12 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
-<<<<<<< HEAD
<div class="result row">
<div class="col-sm-1"></div>
<div class="col-sm-11">
<iframe class="" src="http://192.168.178.30:8000/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
-=======
->>>>>>> development
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index ae56398d5..9ca3c0a5e 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -25,15 +25,12 @@
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
-<<<<<<< HEAD
<div class="result row">
<div class="col-sm-1"></div>
<div class="col-sm-11">
<iframe class="" src="http://192.168.178.30:8000/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
-=======
->>>>>>> development
@foreach($metager->getResults() as $result)
@if($result->number % 7 === 0)
@include('layouts.ad', ['ad' => $metager->popAd()])
--
GitLab