diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index 0753630..e728b87 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -604,7 +604,6 @@ export default class dnReceiptDom extends BasePage {
         }
       }
     }
-<<<<<<< HEAD
     // .library {
     //   width: 100%;
     //   height: 100rpx;
@@ -638,41 +637,6 @@ export default class dnReceiptDom extends BasePage {
     //     }
     //   }
     // }
-=======
-    .library {
-      width: 100%;
-      height: 100rpx;
-      display: flex;
-      .library-left {
-        width: 50%;
-        height: 100%;
-        display: flex;
-        view {
-          width: 100rpx;
-          line-height: 100rpx;
-        }
-        .search {
-          padding-left: 20px;
-        }
-      }
-      .library-right {
-        width: 50%;
-        height: 100%;
-        display: flex;
-        .library-right-title {
-          width: 120rpx;
-          height: 100%;
-          padding-left: 4px;
-          line-height: 100rpx;
-        }
-        .input {
-          width: 200rpx;
-          height: 70rpx;
-          margin-top: 15rpx;
-        }
-      }
-    }
->>>>>>> e06fba98009bdb7923f4a67091d1f3e4224bdb07
     .add {
       width: 100%;
       height: 100rpx;