fixed fuck up

Halalan/app/assets/stylesheets/ver1.css.scss

@@ -22,4 +22,4 @@ th {
 
 td {
 	padding-left: 10px;
-}
+}
\ No newline at end of file

Halalan/app/views/admin/positions/index.html.erb

@@ -3,22 +3,12 @@
 <%=link_to "Add New Position", new_admin_position_path%>
 <hr>
 
-<<<<<<< HEAD
 <% @positions.each do |c| %>
-	<h2><a href="/admin/positions/show"><% c.name %></a></h2>
+	<h2><%= c.name %></h2>
 	<ul>
 		<% c.candidates.each do |p| %>
 			<li><%= link_to "#{p.first_name} #{p.last_name}" , admin_candidate_path(p.id) %></li>
 		<% end %>
 	</ul>
 
-=======
-<% @positions.each do |p| %>
-  	<h2><%= link_to p.name, admin_position_path(p.id) %></h2>
-		<ul>
-		  <% p.candidates.each do |c|%>
-		    <li><%=link_to c.full_name, admin_candidate_path(c.id)%></li>
-		  <% end %>
-	  	</ul>
->>>>>>> 715278555f37edd654b7c9770ce3962b9079fc3b
 <% end %>
\ No newline at end of file

Halalan/app/views/pages/index.html.erb

@@ -14,7 +14,6 @@
 <% end %>
 
 <%@positions.each do |p|%>
-<<<<<<< HEAD
 <div class ="section">
 	<div class ="box">
 		<h4><center><%=p.name%></center></h4>
@@ -41,23 +40,5 @@
 		</table>
 	</div>
 </div>
-=======
-	<h4><%=p.name%></h4>
-	<table class="table table-striped table-bordered">
-		<tr>
-			<th>Name</th>
-			<th>Slogan</th>
-			<th>Total Votes</th>
-			
-		</tr>
-		<%total = 0%>
-		<%p.candidates.each do |c|%>
-		<tr>
-			<td><%=link_to c.full_name, admin_candidate_path(c.id)%></td>
-			<td><%=c.slogan%></td>
-			<td><%=c.votes.count%></td>
-		</tr>
-		<%end%>
-	</table>
->>>>>>> 715278555f37edd654b7c9770ce3962b9079fc3b
+
 <%end%>
\ No newline at end of file