From 30492206998e40eed0304ee7df6d699bb82c7363 Mon Sep 17 00:00:00 2001
From: Ryan Curtin <gth671b@mail.gatech.edu>
Date: Thu, 30 Nov 2017 22:53:22 -0500
Subject: [PATCH] Fix bad merge.

---
 armadillo.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/armadillo.spec b/armadillo.spec
index ac3e0e7..e1da878 100644
--- a/armadillo.spec
+++ b/armadillo.spec
@@ -113,12 +113,12 @@ rm -rf examples/lib_win64
 * Thu Nov 30 2017 Ryan Curtin <ryan@ratml.org> - 8.300.0-1
 - Update Armadillo to 8.300.0.
 
-* Sun Sep 17 2017 Rex Dieter <rdieter@fedoraproject.org> - 8.100.1-2
-- tighten %%files to track library soname
-
 * Thu Oct 26 2017 Ryan Curtin <ryan@ratml.org> - 8.200.1-1
 - Update Armadillo to 8.200.1.
 
+* Sun Sep 17 2017 Rex Dieter <rdieter@fedoraproject.org> - 8.100.1-2
+- tighten %%files to track library soname
+
 * Wed Sep 13 2017 Ryan Curtin <ryan@ratml.org> - 8.100.1-1
 - Update Armadillo to 8.100.1.