conflict

2019-05-15 15:20:04 +08:00
parent 1af91f61ed
commit 2069467268
1 changed files with 0 additions and 4 deletions
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -640,11 +640,7 @@ export default {

 <style>
  .el-table .warning-row {
-<<<<<<< HEAD
    background: yellowgreen;
-=======
-    background: red;
->>>>>>> fe0ba3d7bde1d5cfc6a4a87843e945deaff60a8d
  }
  .rgb196{
    background: palevioletred;