[numpy/f16] Fixup sources and .gitignore

[Orion Poplawski]

commit 0817508a0f3b8f2e0e6f473e9bbec63c411d5f96
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon May 21 10:02:19 2012 -0600

    Fixup sources and .gitignore

 .gitignore |    3 ---
 sources    |    4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ea0e78..9d4b94f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,5 @@ numpy-1.4.1.tar.gz
 /numpy-1.6.0b2.tar.gz
 /numpy-1.6.0.tar.gz
 /numpy-1.6.1.tar.gz
-<<<<<<< HEAD
-=======
 /numpy-1.6.2rc1.tar.gz
 /numpy-1.6.2.tar.gz
->>>>>>> 3979e19... Update to 1.6.2 final
diff --git a/sources b/sources
index 6d171d6..559d8d1 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-2bce18c08fc4fce461656f0f4dd9103e  numpy-1.6.1.tar.gz
-=======
 95ed6c9dcc94af1fc1642ea2a33c1bba  numpy-1.6.2.tar.gz
->>>>>>> 3979e19... Update to 1.6.2 final