inretio/WordPress-Plugin-Boilerplate
1
0
Fork 0
mirror of https://github.com/inretio/WordPress-Plugin-Boilerplate synced 2024-12-22 11:53:53 +02:00
Code Issues Releases Wiki Activity

Revert "merge conflict resolution"

Browse source 
This reverts commit f293c94419.
This commit is contained in:
Tom McFarlin 2013-11-08 16:54:18 -05:00
parent 09e87acdcc
commit b45971682f
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugin-name/plugin-name.php
View file

@ -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.