From 32980f9bc1a92b765b64dbfdea62e15735f191fd Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 17 Mar 2016 16:09:03 -0400
Subject: [PATCH] Fix a problem with the merge in searchform.php

---
 searchform.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/searchform.php b/searchform.php
index a0a8c6009..7ba4df274 100644
--- a/searchform.php
+++ b/searchform.php
@@ -5,7 +5,6 @@
 ?>
 <form class="form-search" role="search" method="get" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<div class="input-append">
-		<input type="text" placeholder="<?php _e('Search', 'largo'); ?>" class="searchbox search-query" value="<?php the_search_query(); ?>" name="s" />
-		<input type="submit" value="<?php _e('Go', 'largo'); ?>" name="search submit" class="search-submit btn">
+		<input type="text" placeholder="<?php _e('Search', 'largo'); ?>" class="searchbox search-query" value="<?php the_search_query(); ?>" name="s" /><button type="submit" name="search submit" class="search-submit btn"><?php _e('Go', 'largo'); ?></button>
 	</div>
 </form>