resolve conflicts

2017-06-20 15:48:08 -04:00 · 2017-06-20 15:48:08 -04:00 · 8bc1cb4e63
parent d4413e6e6f 4e040eece0
commit 8bc1cb4e63
1 changed files with 1 additions and 1 deletions
--- a/frontend/src/download.js
+++ b/frontend/src/download.js
@ -27,7 +27,7 @@ $(document).ready(function() {
        $btn.attr('disabled', 'true');
      }
    });
-    
+
    fileReceiver
    .download()
    .catch(() => {