commit a10f1b4f0c802d04e6509284347d8aeed06558d1
Author:     Alexander Lehmann <alexl...@gmail.com>
AuthorDate: Wed Feb 29 14:29:41 2012 +0100
Commit:     Alexander Lehmann <alexl...@gmail.com>
CommitDate: Wed Feb 29 14:29:41 2012 +0100

    JBEHAVE-727: Some source code is checked in with CR/LF line endings
    moved changes to current head, the commit doesn't change anything except 
line endings
    i hope that merges without problem

diff --git a/jbehave-navigator/src/main/resources/js/jquery-ui.min-1.7.1.js 
b/jbehave-navigator/src/main/resources/js/jquery-ui.min-1.7.1.js
index 226258c..c013760 100644
--- a/jbehave-navigator/src/main/resources/js/jquery-ui.min-1.7.1.js
+++ b/jbehave-navigator/src/main/resources/js/jquery-ui.min-1.7.1.js
@@ -6,4 +6,5 @@
  * and GPL (GPL-LICENSE.txt) licenses.
  *
  * http://docs.jquery.com/UI
- */
jQuery.ui||(function(c){var 
i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.1",plugin:{add:function(k,l,n){var
 m=c.ui[k].prototype;for(var j in 
n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var
 n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var 
m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return
 document.compareDocumentPosition?k.compareDocumentPosition(j)&1...
\ No newline at end of file
+ */
+jQuery.ui||(function(c){var 
i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.1",plugin:{add:function(k,l,n){var
 m=c.ui[k].prototype;for(var j in 
n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var
 n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var 
m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return
 document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!...



Reply via email to