From 494d83d639bdf6dad67d7b60333546c06cfeee0f Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 11 Feb 2019 20:18:40 +0100
Subject: [PATCH] [DOC beta] Add deprecation tag for Ember.merge

(cherry picked from commit 66b47550083c00df6ee41daabb1562c37acb7f50)
---
 packages/@ember/polyfills/lib/merge.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/@ember/polyfills/lib/merge.ts b/packages/@ember/polyfills/lib/merge.ts
index dc88e7d508a..d087eb82143 100644
--- a/packages/@ember/polyfills/lib/merge.ts
+++ b/packages/@ember/polyfills/lib/merge.ts
@@ -24,6 +24,7 @@ export default function merge<T, U>(original: T, updates: U): T & U;
   @param {Object} original The object to merge into
   @param {Object} updates The object to copy properties from
   @return {Object}
+  @deprecated
   @public
 */
 export default function merge(original: object, updates: object) {