From 1a27f04577656afecfaf3f7251a67d8b1ace44d8 Mon Sep 17 00:00:00 2001
From: Bart Kamphorst <bart@kamphorst.com>
Date: Thu, 29 Aug 2019 11:56:34 +0200
Subject: [PATCH] Minor fix in handling conflict message in drag-and-drop
 uploading.

---
 lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb b/lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb
index 59d592f6..a78b0010 100755
--- a/lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb
+++ b/lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb
@@ -260,7 +260,7 @@
               }
               window.ace_editor.insert(text);
             },
-            error: function(r, textStatus, errorThrown) {
+            error: function(data, textStatus, errorThrown) {
               if (data.status == 409) {
                 alert('This file already exists.');
               } else {