From c03f716e8bfdf4d8e96bec2ee1abb9831ec15cab Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 7 Mar 2021 05:57:56 +0100
Subject: Fix conflict between qmlformat and license check

---
 resources/qml/device-verification/AwaitingVerificationConfirmation.qml | 1 +
 resources/qml/device-verification/DeviceVerification.qml               | 1 +
 resources/qml/device-verification/DigitVerification.qml                | 1 +
 resources/qml/device-verification/EmojiElement.qml                     | 1 +
 resources/qml/device-verification/EmojiVerification.qml                | 1 +
 resources/qml/device-verification/Failed.qml                           | 1 +
 resources/qml/device-verification/NewVerificationRequest.qml           | 1 +
 resources/qml/device-verification/Success.qml                          | 1 +
 resources/qml/device-verification/Waiting.qml                          | 1 +
 9 files changed, 9 insertions(+)

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

diff --git a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
index 8d57c8d6..ae62c334 100644
--- a/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
+++ b/resources/qml/device-verification/AwaitingVerificationConfirmation.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index cb3cd8ab..fee0284a 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.10
diff --git a/resources/qml/device-verification/DigitVerification.qml b/resources/qml/device-verification/DigitVerification.qml
index cf5f75ed..a387756d 100644
--- a/resources/qml/device-verification/DigitVerification.qml
+++ b/resources/qml/device-verification/DigitVerification.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3
diff --git a/resources/qml/device-verification/EmojiElement.qml b/resources/qml/device-verification/EmojiElement.qml
index 1b1ecbcf..f5c87a56 100644
--- a/resources/qml/device-verification/EmojiElement.qml
+++ b/resources/qml/device-verification/EmojiElement.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3
diff --git a/resources/qml/device-verification/EmojiVerification.qml b/resources/qml/device-verification/EmojiVerification.qml
index e179b0ed..be9e3938 100644
--- a/resources/qml/device-verification/EmojiVerification.qml
+++ b/resources/qml/device-verification/EmojiVerification.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3
diff --git a/resources/qml/device-verification/Failed.qml b/resources/qml/device-verification/Failed.qml
index bc7dd5fc..5c71b02e 100644
--- a/resources/qml/device-verification/Failed.qml
+++ b/resources/qml/device-verification/Failed.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3
diff --git a/resources/qml/device-verification/NewVerificationRequest.qml b/resources/qml/device-verification/NewVerificationRequest.qml
index 7af19b42..e8589cf7 100644
--- a/resources/qml/device-verification/NewVerificationRequest.qml
+++ b/resources/qml/device-verification/NewVerificationRequest.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3
diff --git a/resources/qml/device-verification/Success.qml b/resources/qml/device-verification/Success.qml
index a454d56e..f2657b12 100644
--- a/resources/qml/device-verification/Success.qml
+++ b/resources/qml/device-verification/Success.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3
diff --git a/resources/qml/device-verification/Waiting.qml b/resources/qml/device-verification/Waiting.qml
index c8dc2a77..3bfa153d 100644
--- a/resources/qml/device-verification/Waiting.qml
+++ b/resources/qml/device-verification/Waiting.qml
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
+//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3
-- 
cgit 1.5.1