Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixing weird commit issue

  • Loading branch information...
commit 2e856aa57de2608e74c60ae342ae56d5ba2ac435 1 parent a403d63
@sksmatt authored
Showing with 0 additions and 10 deletions.
  1. +0 −10 wph-widget-class.php
View
10 wph-widget-class.php
@@ -31,13 +31,7 @@ class WPH_Widget extends WP_Widget
*/
function create_widget( $args ) {
-<<<<<<< HEAD
-
- // setting some defaults
-=======
-
// settings some defaults
->>>>>>> Updating to 1.5
$defaults = array(
'label' => '',
'description' => '',
@@ -58,13 +52,9 @@ function create_widget( $args ) {
$this->fields = $fields;
// set textdomain for internationalization
-<<<<<<< HEAD
$this->textdomain = ( $textdomain ) ? $textdomain : $this->slug;
-
-=======
( $textdomain ) ? $this->textdomain = $textdomain : $this->textdomain = $this->slug;
->>>>>>> Updating to 1.5
// check options
$this->options = array( 'classname' => $this->slug, 'description' => $description );
if ( ! empty( $options ) ) $this->options = array_merge( $this->options, $options );
Please sign in to comment.
Something went wrong with that request. Please try again.