From 393c1d424bacb864c29c5f7fd539b0459b167ba5 Mon Sep 17 00:00:00 2001
From: Loris Guignard <loris.guignard@gmail.com>
Date: Wed, 20 Jul 2016 14:45:06 +0200
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'

---
 example/example.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/example/example.js b/example/example.js
index 6e48d86..72aef7d 100644
--- a/example/example.js
+++ b/example/example.js
@@ -1,7 +1,8 @@
 var DateTime = require('../DateTime.js');
 var React = require('react');
+var ReactDOM = require('react-dom');
 
-React.render(
+ReactDOM.render(
   React.createElement(DateTime, { timeFormat: true }),
   document.getElementById('datetime')
 );

--
Gitblit v1.9.3