From dc8d857f0be34b1d6a2dd764fe9bb4ad64647946 Mon Sep 17 00:00:00 2001
From: HactarCE <6060305+HactarCE@users.noreply.github.com>
Date: Sat, 21 Jan 2023 05:36:50 -0500
Subject: [PATCH] Fix merge conflict

---
 Cargo.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bf75a3f3..34adf908 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,11 +83,7 @@ winres = "0.1"
 [package.metadata.winres]
 FileDescription = "Hyperspeedcube"
 ProductName = "Hyperspeedcube"
-<<<<<<< HEAD
-ProductVersion = "1.0.3"
-=======
 ProductVersion = "1.0.4"
->>>>>>> refs/tags/v1.0.4
 OriginalFilename = "hyperspeedcube.exe"
 LegalCopyright = "Copyright © 2022 HactarCE"