[viking/f16: 9/9] Updated

[Fabian Affolter]

commit db753c86fa3197859487b2c5317e37cbd1f99777
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sun Nov 20 02:01:59 2011 +0100

    Updated

 .gitignore |    3 ---
 sources    |    4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abe8658..dd1bb4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,4 @@ viking-0.9.94.tar.gz
 /viking-1.1.tar.gz
 /viking-1.2.tar.gz
 /viking-1.2.1.tar.gz
-<<<<<<< HEAD
-=======
 /viking-1.2.2.tar.gz
->>>>>>> master
diff --git a/sources b/sources
index 63f353a..08f815f 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-bb6c14608a55e9d9dadf31e0ed4c7d1b  viking-1.2.1.tar.gz
-=======
 460121f135ddc499bb4e51e61fa7fba7  viking-1.2.2.tar.gz
->>>>>>> master