From 712916f2ca56a6185dfe9bf235cb2d60b3786302 Mon Sep 17 00:00:00 2001
From: Aleksandr Kuzminsky <aleks@twindb.com>
Date: Fri, 26 Apr 2019 16:07:20 -0700
Subject: [PATCH] remove conflict

---
 README.rst | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/README.rst b/README.rst
index 5be5ad5ec..a8a0a3eef 100644
--- a/README.rst
+++ b/README.rst
@@ -48,7 +48,6 @@ backup destination. It can be:
 - Amazon S3 bucket
 - Google Cloud Storage bucket
 - Any server with SSH demon
-<<<<<<< HEAD
 
 .. figure:: https://user-images.githubusercontent.com/1763754/56677794-20901b80-6676-11e9-8f71-8de0b0b6f066.png
     :width: 400px
@@ -57,16 +56,6 @@ backup destination. It can be:
     :alt: TwinDB Backup Architecture
     :figclass: align-center
 
-=======
-
-.. figure:: https://user-images.githubusercontent.com/1763754/56677794-20901b80-6676-11e9-8f71-8de0b0b6f066.png
-    :width: 400px
-    :align: center
-    :height: 300px
-    :alt: TwinDB Backup Architecture
-    :figclass: align-center
-
->>>>>>> bdae2df9a45d7018641fb7c20681afc2fb659da2
     TwinDB Backup Architecture
 
 The tool can easily restore the backup copies.