fix merge

This commit is contained in:
DD 2017-10-23 17:15:38 -04:00
parent a538d10992
commit 251967fefb

View file

@ -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 */}