[zyGrib/f16: 3/3] Fix merge conflict

[Pavel Zhukov]

commit e90c8ed6c3758733a4ce1411dc9708e3d1c19aa9
Merge: 9d9615b a73151c
Author: Pavel Zhukov <pavel at zhukoff.net>
Date:   Mon Nov 7 11:13:22 2011 +0400

    Fix merge conflict

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 27d5651,15c83e6..041f07a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
  /zyGrib-3.9.9.tgz
 +/zyGrib-5.0.4.tgz
+ /zyGrib-5.0.2.tgz
  /zyGrib-5.0.6.tgz