removed merge conflict

rgkavodkar · Feb 21, 2016 · 3b1b2cf · 3b1b2cf
1 parent 478c050
commit 3b1b2cf
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/app/views/student_courses/show.html.erb b/app/views/student_courses/show.html.erb
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-       <div class="col-md-6 col-md-offset-3">
-=======
 
->>>>>>> c6f9a7ce075f9d3fbba676726e805b8e35a5df88
+       <div class="col-md-6 col-md-offset-3">
       <table class="table">
 
       <tr>