From 2069467268d7a11d9c23ba50b17ad15d16eda638 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Wed, 15 May 2019 15:20:04 +0800
Subject: [PATCH] conflict

---
 src/views/TechnologyCenter/ImportParts/specificationData.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index bdce2613..e775f0c1 100644
--- 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;