From 1ea257b536d4415d7e0f1921177d739cfd0419bf Mon Sep 17 00:00:00 2001
From: DD Liu <liudi@media.mit.edu>
Date: Mon, 15 May 2017 10:44:49 -0400
Subject: [PATCH] fix merge
---
src/lib/vm-listener-hoc.jsx | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/lib/vm-listener-hoc.jsx b/src/lib/vm-listener-hoc.jsx
index 3a456e804..d2b4f32b5 100644
--- a/src/lib/vm-listener-hoc.jsx
+++ b/src/lib/vm-listener-hoc.jsx
@@ -104,15 +104,9 @@ const vmListenerHOC = function (WrappedComponent) {
onTargetsUpdate: data => {
dispatch(targets.updateEditingTarget(data.editingTarget));
dispatch(targets.updateTargets(data.targetList));
-<<<<<<< HEAD
- },
- onSpriteInfoReport: spriteInfo => {
- dispatch(targets.updateTarget(spriteInfo));
},
onMonitorsUpdate: monitorList => {
dispatch(monitors.updateMonitors(monitorList));
-=======
->>>>>>> develop
}
});
return connect(
--
GitLab