From ba9a0c2a41b6175b0f4a80eb6186c194d0f95e2f342b0b99e8dbb53897578b32 Mon Sep 17 00:00:00 2001
From: Johannes Randerath <joranderathsg@gmail.com>
Date: Mon, 3 Jun 2024 21:45:21 +0200
Subject: [PATCH] Fixed ReadTheDocs support

---
 .readthedocs.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index cb41154..5ae08c6 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -2,11 +2,7 @@
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
-<<<<<<< HEAD
-version: "latest" 
-=======
 version: 1
->>>>>>> 306459b (Fixed ReadTheDocs support)
 
 build:
   os: fedora-40