removed banner

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

@@ -24,17 +24,4 @@ ul.nav navbar-nav navbar-right{
     padding-top: 20px;
 }
 
-.banner{
-	width: 100%;
-	height: 300px;
-	display: block;
-	background-image: url(image-path('philippineflag2.jpg'));
-}
-
 
-.banner > .banner-image{
-	width: 100%;
-	height: 300px;
-	display: block;
-	background-image: url(image-path('philippineflag2.jpg'));
-}
\ No newline at end of file

Halalan-trial/app/views/admin/candidates/index.html.erb

@@ -11,7 +11,7 @@
 			<%@positions.each do |p|%>
 			<hr>
 			<h3><center><%=p.name%></center></h3>
-<<<<<<< HEAD
+
 
 				<table>
 				<table class="table table-hover">
@@ -19,9 +19,8 @@
 						<th witdth = "40%"><center>Name</center></th>
 						<th><center>Slogan</center></th>
 					</thead>
-=======
+
 				<table>
->>>>>>> a1448dc5a8392d3e8fd508db23a835cd0eab52ce
 					<%p.candidates.each do |c|%>
 						<tr>
 							<td>

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

@@ -2,10 +2,6 @@
 <% provide(:title, "Home") %> 
 
 
-<div class="banner">
-	<img class="banner-image" src="images/philippineflag2.jpg">
-</div>
-
 <div class ="container">
 	<div class="row">
 		<div class="col-md-12">