diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index cdd25d78f0f199ec6d0fdbda337670fa2cca4345..040e06842be7e35b696840621a719a8831eadeea 100644
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -148,16 +148,11 @@ function wp_initial_constants() {
  * @since 3.0.0
  */
 function wp_plugin_directory_constants() {
-<<<<<<< HEAD
+
 	if ( ! defined( 'WP_CONTENT_URL' ) ) {
 		define( 'WP_CONTENT_URL', get_option( 'siteurl' ) . '/wp-content' ); // Full URL - WP_CONTENT_DIR is defined further up.
 	}
-=======
-        // patched by lesion [http://core.trac.wordpress.org/ticket/13941]
-	if ( !defined('WP_CONTENT_URL') )
-		define( 'WP_CONTENT_URL', site_url('wp-content' ) );
-		#define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
->>>>>>> d2e28098a... Initial commit
+
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.