commit.git

commit 27b262f76f0099d97d0778fb2e51bafcfd17fba5 (from f53d80424b730deb4383803fe7f951deeeb7045d)
Merge: f53d804 2e94068
Author: barry <[email protected]>
Date:   Mon Nov 30 16:29:58 2015 +0000

    test

diff --git a/wp-content/themes/semona-child/functions.php b/wp-content/themes/semona-child/functions.php
index e0551d1..a01b343 100644
--- a/wp-content/themes/semona-child/functions.php
+++ b/wp-content/themes/semona-child/functions.php
@@ -2,7 +2,11 @@

 require_once( get_stylesheet_directory() . '/post-types.php' );

+<<<<<<< HEAD
 add_action( 'wp_enqueue_scripts', 'theme_enqueue_styles' );
+=======
+
+>>>>>>> 2e9406889737440e37119c946d5031bd8bdc3041
 function theme_enqueue_styles() {

     $parent_style = 'parent-style';
@@ -13,6 +17,7 @@ function theme_enqueue_styles() {
         array( $parent_style )
     );
 }
+<<<<<<< HEAD

 function tabv_func( $atts ) {
     $a = shortcode_atts( array(
@@ -48,3 +53,6 @@ HTML;
     return ob_get_clean();
 }
 add_shortcode( 'footer_contact', 'footer_contact_func' );
+=======
+add_action( 'wp_enqueue_scripts', 'theme_enqueue_styles' );
+>>>>>>> 2e9406889737440e37119c946d5031bd8bdc3041

commit 27b262f76f0099d97d0778fb2e51bafcfd17fba5 (from 2e9406889737440e37119c946d5031bd8bdc3041)
Merge: f53d804 2e94068
Author: barry <[email protected]>
Date:   Mon Nov 30 16:29:58 2015 +0000

    test

diff --git a/wp-content/themes/semona-child/functions.php b/wp-content/themes/semona-child/functions.php
index e550eac..a01b343 100644
--- a/wp-content/themes/semona-child/functions.php
+++ b/wp-content/themes/semona-child/functions.php
@@ -2,7 +2,11 @@

 require_once( get_stylesheet_directory() . '/post-types.php' );

+<<<<<<< HEAD
+add_action( 'wp_enqueue_scripts', 'theme_enqueue_styles' );
+=======

: