Changed applyDiff.isConflict getter to applyDiff.isConflict() getter method (to make it work in IE8)

Author: ZauberNerd

index.js

@@ -306,7 +306,7 @@
     applyDiff: { value: applyDiff, enumerable: true },
     applyChange: { value: applyChange, enumerable: true },
     revertChange: { value: revertChange, enumerable: true },
-    isConflict: { get: function () { return 'undefined' !== typeof conflict; }, enumerable: true },
+    isConflict: { value: function () { return 'undefined' !== typeof conflict; }, enumerable: true },
     noConflict: {
       value: function () {
         if (conflictResolution) {

test/tests.js

@@ -147,14 +147,14 @@ describe('deep-diff', function () {
     it('#isConflict reports conflict in the global namespace for `DeepDiff`', function () {
 // the browser test harness sets up a conflict.
       if (executingInBrowser) {
-        expect(DeepDiff.isConflict).to.be.ok();
+        expect(DeepDiff.isConflict()).to.be.ok();
       }
     });
 
     it('#noConflict restores prior definition for the global `DeepDiff`', function () {
 // the browser test harness sets up a conflict.
       if (executingInBrowser) {
-        expect(DeepDiff.isConflict).to.be.ok();
+        expect(DeepDiff.isConflict()).to.be.ok();
         var another = DeepDiff.noConflict();
         expect(another).to.be(deep);
         expect(DeepDiff).to.be(DeepDiffConflict);