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> </InputGroup>
{/* To be rotation point */} {/* To be rotation point */}
<InputGroup> {/* <InputGroup>
<EditFieldButton <EditFieldButton
imgAlt="Rotation Point Icon" imgAlt="Rotation Point Icon"
imgSrc={rotationPointIcon} imgSrc={rotationPointIcon}
title="Rotation Point" title="Rotation Point"
onClick={function () {}} onClick={function () {}}
/> />
</InputGroup> </InputGroup> */}
</div> </div>
{/* Second Row */} {/* Second Row */}