From 251967fefbbf62068d4a09a9c1d8db501e2a5309 Mon Sep 17 00:00:00 2001
From: DD <liudi08@gmail.com>
Date: Mon, 23 Oct 2017 17:15:38 -0400
Subject: [PATCH] fix merge

---
 src/components/paint-editor/paint-editor.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/paint-editor/paint-editor.jsx b/src/components/paint-editor/paint-editor.jsx
index 72d78f14..37d45c70 100644
--- a/src/components/paint-editor/paint-editor.jsx
+++ b/src/components/paint-editor/paint-editor.jsx
@@ -150,14 +150,14 @@ class PaintEditorComponent extends React.Component {
                         </InputGroup>
 
                         {/* To be rotation point */}
-                        <InputGroup>
+                        {/* <InputGroup>
                             <EditFieldButton
                                 imgAlt="Rotation Point Icon"
                                 imgSrc={rotationPointIcon}
                                 title="Rotation Point"
                                 onClick={function () {}}
                             />
-                        </InputGroup>
+                        </InputGroup> */}
                     </div>
 
                     {/* Second Row */}