fix conflics

c4be8aff · techird · fda0241c · e0631410 · c4be8aff
Commit c4be8aff authored Mar 28, 2014 by techird
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

dropfile.js src/module/dropfile.js +1 -1

No files found.
--- a/src/module/dropfile.js
+++ b/src/module/dropfile.js
@@ -52,7 +52,7 @@ KityMinder.registerModule( "DropFile", function () {
 		};
 		reader.readAsText( file );
 	}
-	
+
 	function manageDraft( minder ){

 		if( !window.draftManager ){