From 43c78b40e97ecfa8b3b665b03049e486345d922a Mon Sep 17 00:00:00 2001
From: nickolsky <nickolsky@gmail.com>
Date: Thu, 20 Nov 2014 02:53:26 +0300
Subject: [PATCH] Added optional allowMerge parameter to non-static
 MetadataStore.importMetadata

---
 breeze/breeze.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/breeze/breeze.d.ts b/breeze/breeze.d.ts
index 6e04c123a2..f8f9c851ad 100644
--- a/breeze/breeze.d.ts
+++ b/breeze/breeze.d.ts
@@ -654,7 +654,7 @@ declare module breeze {
         getEntityTypes(): IStructuralType[];
         hasMetadataFor(serviceName: string): boolean;
         static importMetadata(exportedString: string): MetadataStore;
-        importMetadata(exportedString: string): MetadataStore;
+        importMetadata(exportedString: string, allowMerge?: boolean): MetadataStore;
         isEmpty(): boolean;
         registerEntityTypeCtor(entityTypeName: string, entityCtor: Function, initializationFn?: (entity: Entity) =>void ): void;
         trackUnmappedType(entityCtor: Function, interceptor?: Function): void;