fix conflict

2018-01-15 16:50:54 +01:00 · 2018-01-15 16:50:54 +01:00 · 692c0ce383
parent 2fe61e808f 36f09ab505
commit 692c0ce383
2 changed files with 5 additions and 0 deletions
--- a/site/data/organisations/organisations.json
+++ b/site/data/organisations/organisations.json
@ -558,5 +558,10 @@
    "name": "FOSSGIS e.V.",
    "img": "fossgis.png",
    "url": "https://www.fossgis.de/"
  },
  {
    "name": "Software in the Public Interest",
    "img": "spi-inc.png",
    "url": "http://spi-inc.org/"
  }
 ]
--- a/site/static/img/organisations/spi-inc.png
+++ b/site/static/img/organisations/spi-inc.png