[vanessa_adt/el5/master: 5/5] Rename .cvsignore->.gitignore

[Pavel Alexeev]

commit 35bd2acdc4a3a8b65e9337f48709d4745398fc58
Merge: e10a251 5ca2d2a
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Mon Oct 25 14:34:27 2010 +0400

    Rename .cvsignore->.gitignore

 .gitignore |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index e43779a,69e4433..09ba3fd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  vanessa_adt-0.0.7.tar.gz
++<<<<<<< HEAD
++=======
+ /vanessa_adt-0.0.7.tar.gz
++>>>>>>> origin/master