Fix merge issues.

3 years ago · 62cd7c636a
parent 7e26e88f56
commit 62cd7c636a
2 changed files with 0 additions and 7 deletions
--- a/.gitignore
+++ b/.gitignore
@ -65,9 +65,6 @@ remmina-0.7.5.tar.gz
 /remmina-1.4.20.tar.gz
 /remmina-1.4.21.tar.gz
 /remmina-1.4.23.tar.gz
-<<<<<<< HEAD
-=======
 /remmina-1.4.24.tar.gz
 /remmina-1.4.25.tar.gz
 /remmina-1.4.26.tar.gz
->>>>>>> rawhide
--- a/4
+++ b/4
@ -1,5 +1 @@
-<<<<<<< HEAD
-SHA512 (remmina-1.4.23.tar.gz) = 2fc175d4e81483dcd00bad4a1e62077952d89961f0bf1825c30459fa57b198b646658b456525a278b18550e458c05c450bab991b3c5cba00675dcedb481965a2
-=======
 SHA512 (remmina-1.4.26.tar.gz) = 4e1e2f4b4bbd14c037e3f93f1813156cdf8c425e553d2a34e44e90c18ba4e88e37a5e0942728926fcd50949972a39219e2d7449139edc46c1adfb59d20c8dd8f
->>>>>>> rawhide