Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@HactarCE
HactarCE committed Jan 21, 2023
1 parent fa9ffd9 commit dc8d857
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit dc8d857

Please # to comment.