From e83924bb53632188d34b83aef1bbec42cd22ed6d Mon Sep 17 00:00:00 2001
From: MrCasual <site.github@mrcasual.com>
Date: Thu, 13 Aug 2015 14:32:48 -0400
Subject: [PATCH] Removed .orig file from merge conflict

---
 RoboFile.php.orig | 133 ----------------------------------------------
 1 file changed, 133 deletions(-)
 delete mode 100644 RoboFile.php.orig

diff --git a/RoboFile.php.orig b/RoboFile.php.orig
deleted file mode 100644
index 37131d115b..0000000000
--- a/RoboFile.php.orig
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-class RoboFile extends \Robo\Tasks {
-  function install() {
-    $this->_exec('./composer.phar install');
-    $this->_exec('npm install');
-  }
-
-  function update() {
-    $this->say(getenv('WP_TEST_URL'));
-    $this->_exec('./composer.phar update');
-    $this->_exec('npm update');
-  }
-
-  function watch() {
-    $css_files = array(
-      'assets/css/src/admin.styl',
-      'assets/css/src/rtl.styl'
-    );
-
-<<<<<<< HEAD
-    $command = array(
-      './node_modules/stylus/bin/stylus -u',
-      ' nib -w' . join(' ', $files) . ' -o assets/css/'
-    );
-    $this->_exec(join(' ', $command));
-=======
-    $js_files = glob('assets/js/src/*.js');
-
-    $this->taskWatch()
-      ->monitor($js_files, function() {
-        $this->compileJavascript();
-      })
-      ->monitor($css_files, function() use($css_files) {
-        $this->compileStyles($css_files);
-      })
-      ->run();
-  }
-
-  function compileJavascript() {
-    $this->_exec('./node_modules/webpack/bin/webpack.js');
-  }
-
-  protected function compileStyles($files = array()) {
-    if(empty($files)) { return; }
-
-    $this->_exec(join(' ', array(
-      './node_modules/stylus/bin/stylus',
-      '-u nib',
-      '-w',
-      join(' ', $files),
-      '-o assets/css/'
-    )));
->>>>>>> origin/master
-  }
-
-  function makepot() {
-    $this->_exec('grunt makepot' . ' --gruntfile '
-      . __DIR__ . '/tasks/makepot/makepot.js'
-      . ' --base_path ' . __DIR__);
-  }
-
-  function pushpot() {
-    $this->_exec('grunt pushpot' . ' --gruntfile '
-      . __DIR__ . '/tasks/makepot/makepot.js'
-      . ' --base_path ' . __DIR__);
-  }
-
-  function testUnit() {
-    $this->loadEnv();
-    $this->_exec('vendor/bin/codecept build');
-    $this->_exec('vendor/bin/codecept run unit');
-  }
-
-  function testUnitSingle($unit = null) {
-    if (!$unit) {
-      throw new Exception("Your need to specify what you want to test (e.g.: test:unit-single models/SubscriberCest)");
-    }
-    $this->loadEnv();
-    $this->_exec('vendor/bin/codecept build');
-    $this->_exec('vendor/bin/codecept run unit ' . $unit);
-  }
-
-  function testAcceptance() {
-    $this->loadEnv();
-    $this->_exec('vendor/bin/codecept build');
-    $this->taskExec('phantomjs --webdriver=4444')
-      ->background()
-      ->run();
-    sleep(2);
-    $this->_exec('vendor/bin/codecept run acceptance');
-  }
-
-  function testJavascript() {
-    $this->compileJavascript();
-
-    $this->_exec(join(' ', array(
-      './node_modules/mocha/bin/mocha',
-      '-r tests/javascript/mochaTestHelper.js',
-      'tests/javascript/testBundles/**/*.js'
-    )));
-  }
-
-  function testAll() {
-    $this->loadEnv();
-    $this->_exec('vendor/bin/codecept build');
-    $this->taskexec('phantomjs --webdriver=4444')
-      ->background()
-      ->run();
-    sleep(2);
-    $this->_exec('vendor/bin/codecept run');
-  }
-
-  function testDebug() {
-    $this->_exec('vendor/bin/codecept build');
-    $this->loadEnv();
-    $this->_exec('vendor/bin/codecept run unit --debug');
-  }
-
-  protected function loadEnv() {
-    $dotenv = new Dotenv\Dotenv(__DIR__);
-    $dotenv->load();
-
-    $this->taskWriteToFile('tests/acceptance.suite.yml')
-      ->textFromFile('tests/acceptance.suite.src')
-      ->run();
-
-    $this->taskReplaceInFile('tests/acceptance.suite.yml')
-      ->regex("/url.*/")
-      ->to('url: ' . "'" . getenv('WP_TEST_URL') . "'")
-      ->run();
-  }
-}