From 465aea12e4ecf7692d8d4e6e4f77bc7a032945f6 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 11 Feb 2019 20:40:23 +0100
Subject: [PATCH] [ember] Fix wrongly deprecated Ember.assign

---
 types/ember/index.d.ts            | 1 -
 types/ember/v2/index.d.ts         | 3 +--
 types/ember__polyfills/index.d.ts | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index d0f9896eb9..d7aaa35b36 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -498,7 +498,6 @@ export namespace Ember {
     // TODO: replace with an es6 reexport when declare module 'ember' is removed
     /**
      * Copy properties from a source object to a target object.
-     * @deprecated Use Object.assign
      */
     const assign: typeof EmberPolyfillsNs.assign;
     /**
diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index 54b6d2e4a9..1734ee6a14 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -3131,7 +3131,7 @@ declare module 'ember' {
         function isPresent(obj: any): boolean;
         /**
          * Merge the contents of two objects together into the first object.
-         * @deprecated Use Object.assign
+         * @deprecated Use Ember.assign
          */
         function merge<T, U>(original: T, updates: U): T & U;
         /**
@@ -3284,7 +3284,6 @@ declare module 'ember' {
         function typeOf(item: any): string;
         /**
          * Copy properties from a source object to a target object.
-         * @deprecated Use Object.assign
          */
         function assign<T, U>(target: T, source: U): T & U;
         function assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
diff --git a/types/ember__polyfills/index.d.ts b/types/ember__polyfills/index.d.ts
index e5ace0fe2e..01820351e5 100644
--- a/types/ember__polyfills/index.d.ts
+++ b/types/ember__polyfills/index.d.ts
@@ -8,7 +8,6 @@ import { Mix, Mix3, Mix4 } from './types';
 
 /**
  * Copy properties from a source object to a target object.
- * @deprecated Use Object.assign
  */
 export function assign<T extends object, U extends object>(target: T, source: U): Mix<T, U>;
 export function assign<T extends object, U extends object, V extends object>(target: T, source1: U, source2: V): Mix3<T, U, V>;
@@ -17,6 +16,6 @@ export function assign(target: object, ...sources: object[]): any;
 
 /**
  * Merge the contents of two objects together into the first object.
- * @deprecated Use Object.assign
+ * @deprecated Use Ember.assign
  */
 export function merge<T extends object, U extends object>(original: T, updates: U): Mix<T, U>;