[openconnect/el6] fixed .gitignore

[Nikos Mavrogiannopoulos]

commit f8149db670702cc02d29f408210b52468fbae293
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Fri Aug 1 13:52:16 2014 +0200

    fixed .gitignore

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 76d6996..73bd657 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,12 +26,9 @@ openconnect-2.25.tar.gz
 /openconnect-4.05.tar.gz
 /openconnect-4.06.tar.gz
 /openconnect-4.07.tar.gz
-<<<<<<< HEAD
 /openconnect-4.08.tar.gz
-=======
 /openconnect-4.99.tar.gz
 /openconnect-5.00.tar.gz
 /openconnect-5.01.tar.gz
->>>>>>> c314f3a08ed8b846d617bde075ba5bb316b3c359
 /openconnect-5.03.tar.gz
 /openconnect-5.03.tar.gz.asc