From b45971682f24b794b15a213c726b032f68d264fb Mon Sep 17 00:00:00 2001 From: Tom McFarlin Date: Fri, 8 Nov 2013 16:54:18 -0500 Subject: [PATCH] Revert "merge conflict resolution" This reverts commit f293c94419fe450c08d31674ea20d7658a41b90c. --- plugin-name/plugin-name.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/plugin-name/plugin-name.php b/plugin-name/plugin-name.php index 3c759b0..51d2be1 100644 --- a/plugin-name/plugin-name.php +++ b/plugin-name/plugin-name.php @@ -52,13 +52,6 @@ $plugin_name_admin = 'Plugin_Name_admin'; require_once( plugin_dir_path( __FILE__ ) . "/public/$class_plugin_name_php" ); -$class_plugin_name_php = 'class-plugin-name.php'; -$plugin_name = 'Plugin_Name'; -$class_plugin_name_admin_php = 'class-plugin-name-admin.php'; -$plugin_name_admin = 'Plugin_Name_admin'; - -require_once( plugin_dir_path( __FILE__ ) . "/public/$class_plugin_name_php" ); - /* * Register hooks that are fired when the plugin is activated or deactivated. * When the plugin is deleted, the uninstall.php file is loaded.