Commit 9eff29b9 authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Fehler bei stash pop

parent f63baf43
...@@ -5,14 +5,10 @@ ...@@ -5,14 +5,10 @@
<div class="searchbar {{$class or ''}}"> <div class="searchbar {{$class or ''}}">
<div class="search-input-submit"> <div class="search-input-submit">
<div class="search-input"> <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') }}">
=======
<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"> <button class="hidden" id="search-delete-btn" type="button">
<i class="fa fa-eraser" aria-hidden="true"></i> <i class="fa fa-eraser" aria-hidden="true"></i>
</button> </button>
>>>>>>> Stashed changes
</div> </div>
<div class="search-submit" id="submit-inputgroup"> <div class="search-submit" id="submit-inputgroup">
<button type="submit"> <button type="submit">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment