From c0ff85cf2c5b8530942ed6163775b244a5cd5230 Mon Sep 17 00:00:00 2001
From: Martin Schroschk <martin.schroschk@tu-dresden.de>
Date: Tue, 28 Sep 2021 23:54:52 +0200
Subject: [PATCH] Clean up

---
 doc.zih.tu-dresden.de/wordlist.aspell | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc.zih.tu-dresden.de/wordlist.aspell b/doc.zih.tu-dresden.de/wordlist.aspell
index e1206239e..efc9239c2 100644
--- a/doc.zih.tu-dresden.de/wordlist.aspell
+++ b/doc.zih.tu-dresden.de/wordlist.aspell
@@ -81,7 +81,6 @@ haswell
 HDF
 HDFS
 HDFView
-<<<<<<< HEAD
 Horovod
 hostname
 Hostnames
@@ -183,7 +182,6 @@ ppc
 Preload
 preloaded
 preloading
->>>>>>> preview
 PSOCK
 Pthreads
 pymdownx
-- 
GitLab