From d31ccbd268edd95127f1f196bf1016c8008bfca1 Mon Sep 17 00:00:00 2001
From: ZeroC0D3 Team <zeroc0d3.0912@gmail.com>
Date: Sat, 18 Mar 2017 08:29:14 +0700
Subject: [PATCH] Conflict resolved docker-compose file

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 37462df7..97c9e004 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -249,7 +249,6 @@ services:
         - "3002:3002"
         - "3003:3003"
 
-
 ### Memcached Container #####################################
 
     memcached:
@@ -360,7 +359,6 @@ services:
         - CN="fake.domain.com"
         - EMAIL="fake.email@gmail.com"
 
-
 ### Mailhog Container #########################################
 
     mailhog: