From 60666e27c285f54668adf7af349aed0579712b1a Mon Sep 17 00:00:00 2001
From: MikeRawlins <MikeRawlins@users.noreply.github.com>
Date: Wed, 13 May 2015 16:06:57 +0100
Subject: [PATCH] Fixed it

Was broken, now fixed
---
 404.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/404.php b/404.php
index 8175ce9..2637e99 100644
--- a/404.php
+++ b/404.php
@@ -14,11 +14,7 @@ get_header(); ?>
 
 			<section class="error-404 not-found">
 				<header class="page-header">
-<<<<<<< HEAD
-					<h1 class="page-title"><?php _e( 'Sorry! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
-=======
-					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found..', 'twentyfifteen' ); ?></h1>
->>>>>>> origin/master
+					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
 				</header><!-- .page-header -->
 
 				<div class="page-content">			
@@ -31,4 +27,4 @@ get_header(); ?>
 		</main><!-- .site-main -->
 	</div><!-- .content-area -->
 
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file