From ccbae5e1adac2a352476b0fd7680a0e3192385fc Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Feb 23 2015 18:36:47 +0000
Subject: Fixup gitignore.


---

diff --git a/.gitignore b/.gitignore
index 9f72a20..b6f54a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,3 @@
-<<<<<<< Updated upstream
 /xu4-20150221svn.tar.xz
-=======
-xu4-20100119svn.tar.xz
-/xu4-20110124svn.tar.xz
-/xu4-20110329svn.tar.xz
-/xu4-20111215svn.tar.xz
-/xu4-20120106svn.tar.xz
-/xu4-20130228svn.tar.xz
->>>>>>> Stashed changes
+u4/
+*.rpm