Skip to content

Commit 1461eb4

Browse files
committed
update window resize, update element highlighter, write unit test
1 parent b74e1ae commit 1461eb4

File tree

13 files changed

+2850
-1365
lines changed

13 files changed

+2850
-1365
lines changed

package-lock.json

Lines changed: 0 additions & 363 deletions
This file was deleted.

src/actions/index.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ import {
2828
editorFocused,
2929
editorFocusedRequestedLine,
3030
<<<<<<< HEAD
31+
<<<<<<< HEAD
3132
=======
3233
editorResized,
34+
=======
35+
>>>>>>> e90fafb... update window resize, update element highlighter, write unit test
3336
dragRowDivider,
3437
dragColumnDivider,
3538
>>>>>>> 66eba11... changes
@@ -111,11 +114,14 @@ export {
111114
editorBlurred,
112115
editorFocused,
113116
editorFocusedRequestedLine,
117+
<<<<<<< HEAD
114118
<<<<<<< HEAD
115119
previousConsoleHistory,
116120
nextConsoleHistory,
117121
=======
118122
editorResized,
123+
=======
124+
>>>>>>> e90fafb... update window resize, update element highlighter, write unit test
119125
dragRowDivider,
120126
dragColumnDivider,
121127
>>>>>>> 66eba11... changes

0 commit comments

Comments
 (0)