Merge branch 'master' of ssh://apples.lambdacomplex.org/git/disclosr
[disclosr.git] / admin / resolveConflicts.php
blob:a/admin/resolveConflicts.php -> blob:b/admin/resolveConflicts.php
--- a/admin/resolveConflicts.php
+++ b/admin/resolveConflicts.php
@@ -1,7 +1,7 @@
 <?php
 
 include_once('../include/common.inc.php');
-include_header();
+include_header("Resolve Conflicts");
 // Include the diff class
 echo '<STYLE TYPE="text/css">
 <!--
@@ -23,7 +23,9 @@
     //print_r($rows);
     foreach ($rows as $row) {
         echo '<h2>' . $row->id . '</h2>';
-        echo "Comparing " . $row->value[0] . " and " . $row->value[1];
+        echo "Comparing " . $row->value[0] . " and " . $row->value[1]."<br>";
+	echo "curl -X DELETE http://localhost:5984/disclosr-agencies/".$row->id."?rev=".$row->value[0]."<br>";
+	echo "curl -X DELETE http://localhost:5984/disclosr-agencies/".$row->id."?rev=".$row->value[1]."<br>";
         $docA = explode(",", json_encode($db->get($row->id . "?rev=" . $row->value[0])));
         $docB = explode(",", json_encode($db->get($row->id . "?rev=" . $row->value[1])));
         // Options for generating the diff
@@ -41,3 +43,4 @@
 }
 include_footer();
 ?>
+