meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict

Browse Source
This commit is contained in:
chenjianan
2019-05-15 15:20:04 +08:00
parent 1af91f61ed
commit 2069467268
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -640,11 +640,7 @@ export default {
<style> <style>
.el-table .warning-row { .el-table .warning-row {
<<<<<<< HEAD
background: yellowgreen; background: yellowgreen;
=======
background: red;
>>>>>>> fe0ba3d7bde1d5cfc6a4a87843e945deaff60a8d
} }
.rgb196{ .rgb196{
background: palevioletred; background: palevioletred;