merge fix

6 years ago · 4746574ff1
parent 5c009f5d88
commit 4746574ff1
1 changed files with 0 additions and 24 deletions
--- a/cvat-ui/src/reducers/annotation-reducer.ts
+++ b/cvat-ui/src/reducers/annotation-reducer.ts
@ -422,30 +422,6 @@ export default (state = defaultState, action: AnyAction): AnnotationState => {
                },
            };
        }
-        case AnnotationActionTypes.SETUP_TAG: {
-            const {
-                labelID,
-                objectType,
-                activeControl,
-            } = action.payload;
-
-            return {
-                ...state,
-                annotations: {
-                    ...state.annotations,
-                    activatedStateID: null,
-                },
-                canvas: {
-                    ...state.canvas,
-                    activeControl,
-                },
-                drawing: {
-                    ...defaultState.drawing,
-                    activeLabelID: labelID,
-                    activeObjectType: objectType,
-                },
-            };
-        }
        case AnnotationActionTypes.REPEAT_DRAW_SHAPE: {
            const { activeControl } = action.payload;