testea/test-repo
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Christopher Chedeau committed 2017-06-02 15:44:50 -07:00
1 parent 323d64fb84
commit db0be7fd5b
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
tests/typescript_union/__snapshots__/jsfmt.spec.js.snap
+1 -1
View File
@@ -64,7 +64,7 @@ type UploadState<E, EM, D> =
| D;
type window = Window & {
__REDUX_DEVTOOLS_EXTENSION_COMPOSE__: Function
__REDUX_DEVTOOLS_EXTENSION_COMPOSE__: Function;
};
`;