From dce6831bd89aaea1637640a35e81a995cc9fd67e Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Mon, 21 Mar 2016 17:23:48 +0100
Subject: [PATCH] huge merge fix

---
 .../assets}/_src/less/ascribe/_forms.less     |  0
 .../assets}/_src/less/ascribe/_share.less     |  0
 {functions => ascribe/functions}/blog.php     |  0
 {functions => ascribe/functions}/core.php     |  0
 .../{includes => functions}/cpt-career.php    |  0
 ascribe/{includes => functions}/cpt-event.php |  0
 .../cpt-presscoverage.php                     |  0
 ascribe/{includes => functions}/cpt-team.php  |  0
 .../cpt-testimonial.php                       |  0
 ascribe/includes/core.php                     | 67 -------------------
 {partials => ascribe/partials}/share.php      |  0
 .../yarpp-template-ascribe.php                |  0
 12 files changed, 67 deletions(-)
 rename {assets => ascribe/assets}/_src/less/ascribe/_forms.less (100%)
 rename {assets => ascribe/assets}/_src/less/ascribe/_share.less (100%)
 rename {functions => ascribe/functions}/blog.php (100%)
 rename {functions => ascribe/functions}/core.php (100%)
 rename ascribe/{includes => functions}/cpt-career.php (100%)
 rename ascribe/{includes => functions}/cpt-event.php (100%)
 rename ascribe/{includes => functions}/cpt-presscoverage.php (100%)
 rename ascribe/{includes => functions}/cpt-team.php (100%)
 rename ascribe/{includes => functions}/cpt-testimonial.php (100%)
 delete mode 100644 ascribe/includes/core.php
 rename {partials => ascribe/partials}/share.php (100%)
 rename yarpp-template-ascribe.php => ascribe/yarpp-template-ascribe.php (100%)

diff --git a/assets/_src/less/ascribe/_forms.less b/ascribe/assets/_src/less/ascribe/_forms.less
similarity index 100%
rename from assets/_src/less/ascribe/_forms.less
rename to ascribe/assets/_src/less/ascribe/_forms.less
diff --git a/assets/_src/less/ascribe/_share.less b/ascribe/assets/_src/less/ascribe/_share.less
similarity index 100%
rename from assets/_src/less/ascribe/_share.less
rename to ascribe/assets/_src/less/ascribe/_share.less
diff --git a/functions/blog.php b/ascribe/functions/blog.php
similarity index 100%
rename from functions/blog.php
rename to ascribe/functions/blog.php
diff --git a/functions/core.php b/ascribe/functions/core.php
similarity index 100%
rename from functions/core.php
rename to ascribe/functions/core.php
diff --git a/ascribe/includes/cpt-career.php b/ascribe/functions/cpt-career.php
similarity index 100%
rename from ascribe/includes/cpt-career.php
rename to ascribe/functions/cpt-career.php
diff --git a/ascribe/includes/cpt-event.php b/ascribe/functions/cpt-event.php
similarity index 100%
rename from ascribe/includes/cpt-event.php
rename to ascribe/functions/cpt-event.php
diff --git a/ascribe/includes/cpt-presscoverage.php b/ascribe/functions/cpt-presscoverage.php
similarity index 100%
rename from ascribe/includes/cpt-presscoverage.php
rename to ascribe/functions/cpt-presscoverage.php
diff --git a/ascribe/includes/cpt-team.php b/ascribe/functions/cpt-team.php
similarity index 100%
rename from ascribe/includes/cpt-team.php
rename to ascribe/functions/cpt-team.php
diff --git a/ascribe/includes/cpt-testimonial.php b/ascribe/functions/cpt-testimonial.php
similarity index 100%
rename from ascribe/includes/cpt-testimonial.php
rename to ascribe/functions/cpt-testimonial.php
diff --git a/ascribe/includes/core.php b/ascribe/includes/core.php
deleted file mode 100644
index 600a65a..0000000
--- a/ascribe/includes/core.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-namespace TenUp\ascribe\Core;
-
-/**
- * Set up theme defaults and register supported WordPress features.
- *
- * @since 0.1.0
- *
- * @uses add_action()
- *
- * @return void.
- */
-function setup() {
-    $n = function( $function ) {
-        return __NAMESPACE__ . "\\$function";
-    };
-
-    add_action( 'wp_enqueue_scripts', $n( 'scripts' )     );
-    add_action( 'wp_enqueue_scripts', $n( 'styles' )      );
-
-}
-
-/**
- * Enqueue scripts for front-end.
- *
- * @uses wp_enqueue_script() to load front end scripts.
- *
- * @since 0.1.0
- *
- * @return void.
- */
-function scripts( $debug = false ) {
-
-    if (!is_admin()) {
-        wp_deregister_script('jquery');
-        wp_register_script('jquery', 'https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js', false, '2.2.0', true);
-        wp_enqueue_script('jquery');
-    }
-
-    wp_enqueue_script(
-        'wptheme',
-        WPTHEME_TEMPLATE_URL . "/assets/dist/js/ascribe.min.js",
-        array('jquery'),
-        WPTHEME_VERSION,
-        true
-    );
-}
-
-/**
- * Enqueue styles for front-end.
- *
- * @uses wp_enqueue_style() to load front end styles.
- *
- * @since 0.1.0
- *
- * @return void.
- */
-function styles( $debug = false ) {
-    $min = ( $debug || defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
-
-    wp_enqueue_style(
-        'wptheme',
-        WPTHEME_URL . "/assets/dist/css/ascribe{$min}.css",
-        array(),
-        WPTHEME_VERSION
-    );
-}
diff --git a/partials/share.php b/ascribe/partials/share.php
similarity index 100%
rename from partials/share.php
rename to ascribe/partials/share.php
diff --git a/yarpp-template-ascribe.php b/ascribe/yarpp-template-ascribe.php
similarity index 100%
rename from yarpp-template-ascribe.php
rename to ascribe/yarpp-template-ascribe.php