From 14df4711c33883f8e383729fd0c604272f70236e Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Fri, 4 May 2018 11:54:00 +0200
Subject: [PATCH] Fehler bei stash pop
---
resources/views/parts/searchbar.blade.php | 4 ----
1 file changed, 4 deletions(-)
diff --git a/resources/views/parts/searchbar.blade.php b/resources/views/parts/searchbar.blade.php
index 29fb6eae9..0f8cd53f2 100644
--- a/resources/views/parts/searchbar.blade.php
+++ b/resources/views/parts/searchbar.blade.php
@@ -5,14 +5,10 @@
<div class="searchbar {{$class or ''}}">
<div class="search-input-submit">
<div class="search-input">
-<<<<<<< Updated upstream
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if($class=='startpage-searchbar') autofocus="" @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
-=======
- <input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if($class=='startpage-searchbar') autofocus="" @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="1" autofocus>
<button class="hidden" id="search-delete-btn" type="button">
<i class="fa fa-eraser" aria-hidden="true"></i>
</button>
->>>>>>> Stashed changes
</div>
<div class="search-submit" id="submit-inputgroup">
<button type="submit">
--
GitLab