[xu4] Git continues to confuse me.

[Jason ティビツ]

commit ffe3e67c051703a4aa01757f23bfccbc89bc4204
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Sun Feb 22 15:18:51 2015 -0600

    Git continues to confuse me.

 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index ab6cd0d..9f72a20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,10 @@
+<<<<<<< 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