Merge pull request #183 from twindb/fix-readme

remove conflict
twindb · Apr 27, 2019 · 2d3a2e9 · 2d3a2e9
2 parents ca0675e + 712916f
commit 2d3a2e9
Showing 1 changed file with 0 additions and 11 deletions.
diff --git 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.