From ad50d31efcd157f1007eae5f566e2cfba6db77c3 Mon Sep 17 00:00:00 2001
From: Reza_ashrafi <ashrafimiireza98@gmail.com>
Date: Wed, 1 Jun 2022 20:31:54 +0430
Subject: [PATCH] update src/views/QRScan/Modal/index.js

---
 src/views/QRScan/Modal/index.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/QRScan/Modal/index.js b/src/views/QRScan/Modal/index.js
index 9a66f40..2541a57 100644
--- a/src/views/QRScan/Modal/index.js
+++ b/src/views/QRScan/Modal/index.js
@@ -45,11 +45,7 @@ class QRModal extends Component {
                   <div className="d-flex" style={{ justifyContent: "center" }}>
                     <Input
                       name="pageNumber"
-<<<<<<< HEAD
-                      // label={window.t("نام")}
-=======
                       // label={window.t("نام")
->>>>>>> 53a5f9691ceb663783b37f08a7a871308d2a21dd
                       parent={this}
                       defaultValue={pageNumber}
                       maxLength={3}
@@ -109,11 +105,7 @@ class QRModal extends Component {
                     </span>
                     <Input
                       name="pageNumber"
-<<<<<<< HEAD
-                      // label={window.t("نام")}
-=======
                       // label={window.t("نام")
->>>>>>> 53a5f9691ceb663783b37f08a7a871308d2a21dd
                       parent={this}
                       defaultValue={pageNumber}
                       maxLength={3}