commit 8dc94a87e6176f45bec4d08ca57cd6aedb1c15e7
author Andy Bavier <acb@cs.princeton.edu> Wed Jun 15 14:31:39 2016 -0700
committer GitHub <noreply@github.com> Wed Jun 15 14:31:39 2016 -0700
tree abc10a75e022510790c4c46d864d7a975c0916c8
parent e50e427377495cd05cebf9d11fdde1a6d48e0d20

Remove artifact of merge conflict

xos/core/xoslib/dashboards/xosTenant.html

diff --git a/xos/core/xoslib/dashboards/xosTenant.html b/xos/core/xoslib/dashboards/xosTenant.html
index b083bde..814f3de 100644
--- a/xos/core/xoslib/dashboards/xosTenant.html
+++ b/xos/core/xoslib/dashboards/xosTenant.html
@@ -4,7 +4,6 @@
 <!-- inject:css -->
 <link rel="stylesheet" href="/static/css/xosTenant.css">
 <!-- endinject -->
-<<<<<<< HEAD
 
 
 <div ng-app="xos.tenant" id="xosTenant" class="container-fluid">
@@ -15,4 +14,4 @@
 <!-- endjs -->
 <!-- inject:js -->
 <script src="/static/js/xosTenant.js"></script>
-<!-- endinject -->
\ No newline at end of file
+<!-- endinject -->