From db0be7fd5bc8b65ce40f7031acd40381cb2777c3 Mon Sep 17 00:00:00 2001
From: Christopher Chedeau <vjeux@fb.com>
Date: Fri, 2 Jun 2017 15:44:50 -0700
Subject: [PATCH] fix conflict

---
 tests/typescript_union/__snapshots__/jsfmt.spec.js.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/typescript_union/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_union/__snapshots__/jsfmt.spec.js.snap
index e4c24c090..5e2fecdd7 100644
--- a/tests/typescript_union/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_union/__snapshots__/jsfmt.spec.js.snap
@@ -64,7 +64,7 @@ type UploadState<E, EM, D> =
   | D;
 
 type window = Window & {
-  __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: Function
+  __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: Function;
 };
 
 `;