From 20266325fce0accd503aee0563c47adb31430c5d Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Fri, 8 Nov 2019 13:03:22 -0600
Subject: [PATCH] combined import definitions in discourse-loader

---
 app/assets/javascripts/discourse-loader.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 5016efe3956..876aca44ce2 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -78,7 +78,8 @@ var define, requirejs;
         inject: Ember.inject.service
       },
       "@ember/utils": {
-        isEmpty: Ember.isEmpty
+        isEmpty: Ember.isEmpty,
+        isNone: Ember.isNone
       },
       rsvp: {
         default: Ember.RSVP,
@@ -104,9 +105,6 @@ var define, requirejs;
       },
       "@ember/error": {
         default: Ember.error
-      },
-      "@ember/utils": {
-        isNone: Ember.isNone
       }
     };
   }