From 5a125c093c257f153ec75f57f48200eba1ef62d3 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Tue, 30 Oct 2018 02:33:49 +0000
Subject: [PATCH] Fix merge
---
src/systems/userinput/devices/mouse.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/systems/userinput/devices/mouse.js b/src/systems/userinput/devices/mouse.js
index eb5cef630..3252fb737 100644
--- a/src/systems/userinput/devices/mouse.js
+++ b/src/systems/userinput/devices/mouse.js
@@ -70,4 +70,3 @@ export class MouseDevice {
window.oncontextmenu = e => {
e.preventDefault();
};
->>>>>>> 81d272a82c36362425464a2dd8f222a60bdad7f6
--
GitLab