From 3b1a8296fff463b56dd0e8e40102ac8519ac3a1f Mon Sep 17 00:00:00 2001
From: Avtandil Kikabidze <akalongman@gmail.com>
Date: Sun, 24 Jun 2018 20:49:32 +0400
Subject: [PATCH] Fix merging issues

---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index ec6750a8..0b8c937d 100644
--- a/composer.json
+++ b/composer.json
@@ -29,8 +29,7 @@
         "jakub-onderka/php-parallel-lint": "^0.9",
         "predis/predis": "^1.1",
         "phpspec/prophecy": "^1.6.1",
-        "elasticsearch/elasticsearch": "^6.0"
-        "phpspec/prophecy": "^1.6.1",
+        "elasticsearch/elasticsearch": "^6.0",
         "rollbar/rollbar": "^1.3"
     },
     "suggest": {