Merge pull request #111 from tolgamizrakci/development

fixed unmerged files

Author: tolgamizrakci

main.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require("path");
 
 const {
   app,
@@ -10,11 +10,7 @@ const {
 } = require("electron");
 
 // Uncomment below for hot reloading during development
-<<<<<<< HEAD
-require("electron-reload")(__dirname);
-=======
 // require('electron-reload')(__dirname);
->>>>>>> 11e0643d114b6c294dc2b66c3fd4727ffb173825
 
 // const isDev = true;
 const isDev =
@@ -77,11 +73,11 @@ const createWindow = () => {
       "node-Integration": false
     },
     show: false,
-    icon: path.join(__dirname, '/src/public/icons/mac/icon.icns'),
+    icon: path.join(__dirname, "/src/public/icons/mac/icon.icns"),
     win: {
-      icon: path.join(__dirname, '/src/public/icons/win/icon.ico'),
-      target: ['portable'],
-    },
+      icon: path.join(__dirname, "/src/public/icons/win/icon.ico"),
+      target: ["portable"]
+    }
   });
 
   // and load the index.html of the app.

src/components/TransformerComponent.tsx

@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 import React, { Component } from "react";
 import { Transformer } from "react-konva";
 import { ComponentInt, ComponentsInt, ChildInt } from "../utils/interfaces";
-=======
-import React, { Component } from 'react';
-import { Transformer } from 'react-konva';
-import { ChildInt } from '../utils/interfaces.ts';
->>>>>>> 11e0643d114b6c294dc2b66c3fd4727ffb173825
 
 interface PropsInt {
   focusChild: ChildInt;
@@ -42,9 +36,9 @@ export default class TransformerComponent extends Component<PropsInt> {
   render() {
     return (
       <Transformer
-        className={'Transformer'}
+        className={"Transformer"}
         rotateEnabled={false}
-        ref={(node) => {
+        ref={node => {
           this.transformer = node;
         }}
         borderEnabled={false}