fix: conflit

544ec559 · xiexiaoqin · 5bd00ca2 · 544ec559
Commit 544ec559 authored Apr 25, 2020 by xiexiaoqin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

meetingDetail.acss pages/meetingDetail/meetingDetail.acss +0 -3

No files found.
--- a/pages/meetingDetail/meetingDetail.acss
+++ b/pages/meetingDetail/meetingDetail.acss
@@ -650,5 +650,3 @@ input {
 .meetingWayShowTop>.icon {
    color: rgb(216, 216, 216) !important
 }
+\ No newline at end of file
-
->>>>>>>dev
\ No newline at end of file