From 46bff98a3fbe1be3c5cc815be4c2ebab4d81dcf4 Mon Sep 17 00:00:00 2001
From: Jim <jsfb@github>
Date: Mon, 17 Nov 2014 17:14:00 -0800
Subject: [PATCH] Fixed 'imports' to resolve merge conflict

---
 src/core/ReactContext.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/ReactContext.js b/src/core/ReactContext.js
index fd2b977c80672..449796988e20b 100644
--- a/src/core/ReactContext.js
+++ b/src/core/ReactContext.js
@@ -13,6 +13,7 @@
 
 var assign = require('Object.assign');
 var emptyObject = require('emptyObject');
+var monitorCodeUse = require('monitorCodeUse');
 
 /**
  * Keeps track of the current context.
@@ -45,6 +46,8 @@ var ReactContext = {
    * @return {ReactComponent|array<ReactComponent>}
    */
   withContext: function(newContext, scopedCallback) {
+    monitorCodeUse('react_with_context', {newContext: newContext});
+
     var result;
     var previousContext = ReactContext.current;
     ReactContext.current = assign({}, previousContext, newContext);