From 28c06bef4392108fc219c0accefe5a7db7c9f065 Mon Sep 17 00:00:00 2001
From: Ries van Twisk <github@rvt.dds.nl>
Date: Sun, 29 Dec 2019 10:13:57 +0100
Subject: Merge conflict fix

---
 compat/qhash.hpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'compat')

diff --git a/compat/qhash.hpp b/compat/qhash.hpp
index 72c5e7cd..478f0d7d 100644
--- a/compat/qhash.hpp
+++ b/compat/qhash.hpp
@@ -1,17 +1,5 @@
 #pragma once
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-#include <QHash>
-#include <QString>
 #include <functional>
-
-namespace std {
-  template<> struct hash<QString> {
-    size_t operator()(const QString& s) const noexcept {
-      return (size_t) qHash(s);
-    }
-  };
-}
-#else
-#include <QHashFunctions>
-#endif
\ No newline at end of file
+#include <QString>
+#include <QHashFunctions>
\ No newline at end of file
-- 
cgit v1.2.3