[gimp-web: 42/42] Fix .gitignore conflict

[Pat David <patdavid src gnome org>]

commit f69119ffcc99c441bf757171eab09261215e15a1
Merge: 7b435746 168991e0
Author: Pat David <patdavid gmail com>
Date:   Thu Oct 31 11:13:25 2019 -0500

    Fix .gitignore conflict

 .gitignore                                         |   1 +
 GIMP_VERSIONS                                      |  23 ++
 content/develop/index.md                           |   2 -
 content/docs/userfaq.md                            |  30 ++-
 content/news/2019-07_GIMP-2.99.2_Released/.gitkeep |   0
 content/news/2019-07_GIMP-2.99.2_Released/index.md |  49 ++++
 .../news/2019-10_GIMP-2.10.14_Released/.gitkeep    |   0
 .../gimp-2-10-14-filter-clipping.jpg               | Bin 0 -> 79421 bytes
 .../gimp-2-10-14-normal-map.jpg                    | Bin 0 -> 223279 bytes
 .../gimp-2-10-14-out-of-canvas.jpg                 | Bin 0 -> 124807 bytes
 .../gimp-2-10-14-wilber-and-co-out-of-canvas.jpg   | Bin 0 -> 296863 bytes
 .../news/2019-10_GIMP-2.10.14_Released/index.md    | 295 +++++++++++++++++++++
 12 files changed, 389 insertions(+), 11 deletions(-)
---
diff --cc .gitignore
index a16a68c7,e70eaf2c..36202777
--- a/.gitignore
+++ b/.gitignore
@@@ -15,6 -15,4 +15,7 @@@ __pycache__
  
  # Vim swap files
  *.swp
 +
 +# Python virtual environments
 +py2-venv
+ py3-venv