From 92483a2d6f34ce925ee824e8b2d3183f0cf902fc Mon Sep 17 00:00:00 2001
From: Kyle Roux <kyle@casepeer.com>
Date: Tue, 16 May 2017 11:08:51 -0700
Subject: [PATCH] update merge fix

---
 templates/web/contacts.html | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/templates/web/contacts.html b/templates/web/contacts.html
index fc0df3b..ff4aa6e 100644
--- a/templates/web/contacts.html
+++ b/templates/web/contacts.html
@@ -21,15 +21,11 @@
 			<td>{{ contact.phone }}</td>
 			<td class="text-right">
 				<div class="row">
-					<div class="col-xs-6">
-						<a class="btn btn-primary" href="{{ url_for('edit_contact', id=contact.id) }}">Edit</a>
-					</div>
-					<div class="col-xs-6">
-						<form action="{{ url_for('contacts_delete') }}" method="post">
-							<input type="hidden" name="id" value="{{ contact.id }}">
-							<input type="submit" class="btn btn-danger" data-toggle="confirmation" {# data-title="¿Estas seguro?" #} value="Delete">
-						</form>
-					</div>
+					<form action="{{ url_for('contacts_delete') }}" method="post" class="pull-right">
+						<input type="hidden" name="id" value="{{ contact.id }}">
+						<input type="submit" class="btn btn-danger" data-toggle="confirmation" {# data-title="¿Estas seguro?" #} value="Delete">
+					</form>
+					<a class="btn btn-primary pull-right" href="{{ url_for('edit_contact', id=contact.id) }}">Edit</a>
 				</div>
 			</td>
 		</tr>