Commit 544ec559 by xiexiaoqin

fix: conflit

parent 5bd00ca2
...@@ -649,6 +649,4 @@ input { ...@@ -649,6 +649,4 @@ input {
.meetingWayShowTop>.icon { .meetingWayShowTop>.icon {
color: rgb(216, 216, 216) !important color: rgb(216, 216, 216) !important
} }
\ No newline at end of file
>>>>>>>dev
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment