huge merge fix

ascribe/includes/core.php

@@ -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
-    );
-}