refs #5297 cambio actual

2023-05-08 10:17:35 +02:00 · 2023-05-08 10:17:35 +02:00 · 96b5749e1e
parent 2c6f71b4c4
commit 96b5749e1e
1 changed files with 0 additions and 3 deletions
--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@ -1,6 +1,5 @@
 import getBrowser from '../../helpers/puppeteer';

-<<<<<<< HEAD
 const $ = {
    saveButton: 'vn-supplier-fiscal-data button[type="submit"]',
 };
@ -16,8 +15,6 @@ const $inputs = {
    sageTaxType: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageTaxTypeFk"]'
 };

-=======
->>>>>>> a51481c00ea9f503d002b0ba0e259ea51b81677d
 describe('Supplier fiscal data path', () => {
    let browser;
    let page;