From: Joris van Zundert <joris.van.zundert@gmail.com>
Date: Fri, 5 Jul 2013 07:33:09 +0000 (+0200)
Subject: Merged out conflicts
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=485c70ec052eb34891627e7a086edf47eb43aa66;p=scpubgit%2Fstemmaweb.git

Merged out conflicts
---

485c70ec052eb34891627e7a086edf47eb43aa66
diff --cc root/js/relationship.js
index 8e9bed7,89ca5e8..c84b954
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@@ -949,6 -925,11 +965,9 @@@ $(document).ready(function () 
    });
    
    
+   // Set up the relationship creation dialog. This also functions as the reading
+   // merge dialog where appropriate.
 -  var relation_buttonset = {
 -  };
+ 			  
    if( editable ) {
  	$( "#dialog-form" ).dialog({
  	autoOpen: false,