Merge https://github.com/declanmaher/InstagramScraper with local copy

Conflicts: approvedImages.class.php nbproject/private/private.xml saveApprovedImages.php
declanmaher · Feb 20, 2014 · d335605 · d335605
2 parents db63ebd + f1b1438
commit d335605
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/approvedImages.class.php b/approvedImages.class.php
@@ -38,7 +38,11 @@ public function get_approved_images() {
    * @param string $savedImages
    * 
    */
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> f1b143821875c0370200f046e2e84e7545a90e45
     function insert_approved_images($savedImages) {
 
          if(!empty($savedImages)) { 

diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
diff --git a/nbproject/project.properties b/nbproject/project.properties
diff --git a/nbproject/project.xml b/nbproject/project.xml
diff --git a/saveApprovedImages.php b/saveApprovedImages.php
@@ -10,8 +10,12 @@
 
 	<div style='text-align:center'>
             <p></p>	
+<<<<<<< HEAD
 <h3>Images Approved!</h3>
 
+=======
+<h3>Images Approved</h3>
+>>>>>>> f1b143821875c0370200f046e2e84e7545a90e45
 <?php
  if(!empty($_POST['savedImages'])) {