resolve merge markup

Author: benbalter

jekyll-export.php

@@ -451,10 +451,6 @@ function copy_recursive($source, $dest) {
 
 }
 
-<<<<<<< HEAD
-
-$je = new Jekyll_Export();
-=======
 $je = new Jekyll_Export();
 
 if ( defined('WP_CLI') && WP_CLI ) {
@@ -470,5 +466,4 @@ function __invoke() {
 
   WP_CLI::add_command( 'jekyll-export', 'Jekyll_Export_Command' );
 
-}
->>>>>>> 777653cc7503096869582148f8b7e434ac5dbab9
+}