fix merge conflicts

raideus · Jul 6, 2015 · 7349039 · 7349039
2 parents 30ead5b + 287a1c5
commit 7349039
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 demo/.DS_Store
+
 .idea
 test.php
 template-*

diff --git a/wpas.php b/wpas.php
@@ -2,7 +2,6 @@
 /*
 Plugin Name: WP Advanced Search Framework
 Plugin URI: http://wpadvancedsearch.com
-Description: 
 Version: 1.4
 Author: Sean Butze
 Author URI: http://seanbutze.com
@@ -257,5 +256,4 @@ private function get_request() {
         $request = $this->factory->getRequest();
         return $request->all();
     }
-
-}
+}