From 999411da293d3d35ff31709a9d63587f28bae8cb Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 22 May 2017 18:43:49 -0500
Subject: [PATCH] Fix inability to assign services with no variables, closes
 #447

---
 CHANGELOG.md                          | 4 ++++
 app/Repositories/ServerRepository.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d9108b86..8586931f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v0.6.1 (Courageous Carniadactylus)
+### Fixed
+* Fixes a bug preventing the use of services that have no variables attached to them.
+
 ## v0.6.0 (Courageous Carniadactylus)
 ### Fixed
 * Bug causing error logs to be spammed if someone timed out on an ajax based page.
diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php
index 46e30b5da..e75b31bac 100644
--- a/app/Repositories/ServerRepository.php
+++ b/app/Repositories/ServerRepository.php
@@ -733,6 +733,10 @@ class ServerRepository
             $i++;
         }
 
+        if ($parsed->count() === 0) {
+            return collect($merge);
+        }
+
         return $parsed->merge($merge);
     }