[packages/aegisub] revert accidental change in previous commit

atler atler at pld-linux.org
Thu Jul 2 17:31:00 CEST 2020


commit e85d4ccb7a5e5460a5feb12cd157e469d7af5f53
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jul 2 17:26:09 2020 +0200

    revert accidental change in previous commit

 aegisub.spec | 5 -----
 1 file changed, 5 deletions(-)
---
diff --git a/aegisub.spec b/aegisub.spec
index c7af3ce..3e7ea35 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -99,12 +99,7 @@ mkdir vendor
 %{__mv} vendor.keep/{luabins,luajit,universalchardet} vendor
 
 %build
-<<<<<<< Updated upstream
 %{__aclocal} -I m4macros
-=======
-%{__libtoolize}
-%{__aclocal}
->>>>>>> Stashed changes
 %{__autoconf}
 %{__autoheader}
 %configure \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/aegisub.git/commitdiff/bbbfb4b61e92432e4c927331ff89f48e76cd8b6f



More information about the pld-cvs-commit mailing list