From a54a973ad6be4a1e71be6d8f993600fb02601574 Mon Sep 17 00:00:00 2001
From: Chethan2k1 <40890937+Chethan2k1@users.noreply.github.com>
Date: Fri, 22 May 2020 11:17:02 +0530
Subject: Adding DeviceList for userprofile

---
 resources/qml/device-verification/DeviceVerification.qml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'resources/qml/device-verification/DeviceVerification.qml')

diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index 2c9486ae..dd637e59 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -267,11 +267,7 @@ ApplicationWindow {
 						model: 7
 						delegate: Rectangle {
 							color: "transparent"
-<<<<<<< HEAD
-							implicitHeight: Qt.application.font.pixelSize * 3
-=======
 							implicitHeight: Qt.application.font.pixelSize * 8
->>>>>>> Add DeviceVerificationFlow dummy and verification test button
 							implicitWidth: col.width
 							ColumnLayout {
 								id: col
@@ -414,11 +410,7 @@ ApplicationWindow {
 			property string title: "Verification timed out"
 			ColumnLayout {
 				spacing: 16
-<<<<<<< HEAD
-				Label {
-=======
 				Text {
->>>>>>> Add DeviceVerificationFlow dummy and verification test button
 					Layout.maximumWidth: 400
 					Layout.fillHeight: true
 					Layout.fillWidth: true
-- 
cgit 1.5.1