solve conflict file
This commit is contained in:
@@ -0,0 +1 @@
|
||||
.reultBox[data-v-7486a0b3]{margin-top:48px;margin-bottom:24px}.table[data-v-a116ccfa] .ant-pagination{padding:0 24px}
|
||||
Reference in New Issue
Block a user
@@ -0,0 +1 @@
|
||||
.reultBox[data-v-7486a0b3]{margin-top:48px;margin-bottom:24px}.table[data-v-a116ccfa] .ant-pagination{padding:0 24px}
|
||||