From 3c51e215b88758aa91e7cd6b28e399e44800655a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Such=C3=A1nek?= <marek.suchanek@gmail.com>
Date: Mon, 11 Jul 2022 11:52:55 +0200
Subject: [PATCH] Release 1.15.0

---
 docs/conf.py                         |  4 ++--
 docs/deployment/local-deployment.rst | 15 ---------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index cffb371..b2cde95 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,11 +18,11 @@
 # -- Project information -----------------------------------------------------
 
 project = 'FAIR Data Point'
-copyright = '2021, Dutch Techcentre for Life Sciences'
+copyright = '2022, Dutch Techcentre for Life Sciences'
 author = 'Dutch Techcentre for Life Sciences'
 
 # The full version, including alpha/beta/rc tags
-release = '1.14'
+release = '1.15'
 
 
 rst_prolog = f"""
diff --git a/docs/deployment/local-deployment.rst b/docs/deployment/local-deployment.rst
index 8bf2cce..bda8eee 100644
--- a/docs/deployment/local-deployment.rst
+++ b/docs/deployment/local-deployment.rst
@@ -15,17 +15,10 @@ Here is an example of the simplest `Docker Compose <https://docs.docker.com/comp
     services:
 
         fdp:
-<<<<<<< HEAD
-            image: fairdata/fairdatapoint:1.13
-
-        fdp-client:
-            image: fairdata/fairdatapoint-client:1.13
-=======
             image: fairdata/fairdatapoint:|compose_ver|
 
         fdp-client:
             image: fairdata/fairdatapoint-client:|compose_ver|
->>>>>>> 9847a0d (Release 1.14.0)
             ports:
                 - 80:80
             environment:
@@ -76,20 +69,12 @@ Then, we need to mount the application config into the FDP container and update
     services:
 
         fdp:
-<<<<<<< HEAD
-            image: fairdata/fairdatapoint:1.13
-=======
             image: fairdata/fairdatapoint:|compose_ver|
->>>>>>> 9847a0d (Release 1.14.0)
             volumes:
                 - ./application.yml:/fdp/application.yml:ro
 
         fdp-client:
-<<<<<<< HEAD
-            image: fairdata/fairdatapoint-client:1.13
-=======
             image: fairdata/fairdatapoint-client:|compose_ver|
->>>>>>> 9847a0d (Release 1.14.0)
             ports:
                 - 8080:80
             environment: