notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

Fixes the latest merge

Browse source
This commit is contained in:
Paul Schneider 2015-10-19 21:41:13 +02:00
commit d8a5ebd526
11 changed files with 72 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

5
web/Scripts/yavsc.js
View file

@ -62,8 +62,7 @@ self.onAjaxError = function (xhr, ajaxOptions, thrownError) {
return self;
})();
<<<<<<< HEAD
=======
$(document).ready(function(){
$body = $("body");
@ -87,4 +86,4 @@ $(document).on({
}}
});
});
>>>>>>> 5cb90afe2ce804d06034b0e0aa52e73c33baff83