From e85d4ccb7a5e5460a5feb12cd157e469d7af5f53 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Thu, 2 Jul 2020 17:26:09 +0200
Subject: [PATCH] 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 \
-- 
2.44.0