Update functions.php

weblab · Aug 20, 2014 · 1c450c2 · 1c450c2
1 parent fa18fe4
commit 1c450c2
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/functions.php b/functions.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 /**
  * cornerstone functions and definitions
@@ -188,4 +187,4 @@ function load_custom_wp_admin_style($hook) {
 }
 add_action( 'admin_enqueue_scripts', 'load_custom_wp_admin_style' );
 
-add_theme_support( 'post-thumbnails' ); 
+add_theme_support( 'post-thumbnails' );