revert accidental change in previous commit

diff --git a/aegisub.spec b/aegisub.spec
index c7af3ce938bf5b71a42b5a4784c9c3aa753d4a18..3e7ea35faaa9a0fa897acd9811847f1d1a17a20e 100644 (file)
--- 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 \