Fix merge conflict

This commit is contained in:
Dan Abramov
2017-03-23 19:55:23 +00:00
@@ -12,7 +12,7 @@
'use strict';
const invariant = require('invariant');
const invariant = require('fbjs/lib/invariant');
let caughtError = null;