refactor to make generate-qareports and make generate-devdoc

2016-12-04 01:37:28 +01:00
parent bf1b4e0a35
commit 2e72698ed9
6 changed files with 87 additions and 74 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,11 +25,7 @@ services:
    links:
    - postgres
  import-osm:
-<<<<<<< HEAD
-    image: "openmaptiles/import-osm:add_tools"
-=======
-    image: "openmaptiles/import-osm:0.1"
->>>>>>> master
+    image: "openmaptiles/import-osm:0.2"
    env_file: .env
    environment:
      DIFF_MODE: "false"