From ab12cbcbef3f7c40a23813a374b55ee7d05e3243 Mon Sep 17 00:00:00 2001
From: douglas <douglascvas@gmail.com>
Date: Tue, 4 Sep 2018 21:33:44 +1000
Subject: [PATCH] #30 - Merged circleci workflows

---
 .circleci/config.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ffc6edc8..2f274ca3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -87,19 +87,17 @@ jobs:
       - run: npm run deploy-sls
 workflows:
   version: 2
-  frontend-build-deploy:
+  application-build-deploy:
     jobs:
       - ui-build
+      - services-build
       - ui-deploy:
           requires:
             - ui-build
           filters:
             branches:
               only: master
-  backend-build-deploy:
-    jobs:
-      - services-build
       - services-deploy:
           filters:
             branches:
-              only: master
\ No newline at end of file
+              only: master