fix conflict

Helius

2020-12-11 37b2fa02d4e9540b67f9ec02740d7720ec38df3a

1
2
3
4
5
package com.matrix.component.ueditor.define;
 
public enum ActionState {
    UNKNOW_ERROR
}