From 8890f6e41382959d5464f11cfc40aeddf919fa11 Mon Sep 17 00:00:00 2001
From: MickeyKay <mickeyskay@gmail.com>
Date: Mon, 23 Mar 2015 12:19:09 -0700
Subject: [PATCH] Fix merge conflict causing PHP error.

---
 includes/functions/theme-functions.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/includes/functions/theme-functions.php b/includes/functions/theme-functions.php
index b79732d..eb49a3b 100644
--- a/includes/functions/theme-functions.php
+++ b/includes/functions/theme-functions.php
@@ -462,11 +462,7 @@ function trestle_read_more_link( $default_text ) {
 	// Get Trestle custom "read more" link text
 	$custom_text = esc_attr( genesis_get_option( 'trestle_read_more_text' ) );
 
-<<<<<<< HEAD
-	if ( $custom_text )	{
-=======
-	if ( $custom_text )
->>>>>>> 9de3310f116bb4f7dd5323ca40b16f2fe4160dcd
+	if ( $custom_text ) {
 		return '&hellip;&nbsp;<a class="more-link" title="' . $custom_text . '" href="' . get_permalink() . '">' . $custom_text . '</a>';
 	} else {
 		return $default_text;