From 53401b6aa7e7b38b50a3848cb03dd369694effb8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 20 Feb 2018 15:01:45 -0800
Subject: [PATCH] Fix merging a remote diff

---
 editor/js/ui/diff.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js
index cfcb60ceb..5a1ceea7f 100644
--- a/editor/js/ui/diff.js
+++ b/editor/js/ui/diff.js
@@ -1391,7 +1391,7 @@ RED.diff = (function() {
             }
         })
 
-        RED.nodes.version(remoteDiff.rev);
+        RED.nodes.version(diff.remoteDiff.rev);
 
         RED.view.redraw(true);
         RED.palette.refresh();