merging latest pull

Author: jzuniga206

src/actions/components.ts

@@ -1,16 +1,9 @@
 import {
-<<<<<<< HEAD
   ComponentInt,
   ComponentsInt,
   PropInt,
   ChildInt,
-  Action,
-  ApplicationStateInt,
-  LoadInitData,
-  AddComponent
-=======
-  ComponentInt, ComponentsInt, PropInt, ChildInt, Action
->>>>>>> 879a79ab127239023143128b74bc26e7034e561f
+  Action
 } from '../utils/Interfaces';
 
 import {
@@ -37,7 +30,7 @@ import {
   ADD_PROP,
   DELETE_ALL_DATA,
   UPDATE_HTML_ATTR,
- // UPDATE_CHILDREN_SORT, --The reason why this is commented out is because of the unused reducer of the same name, for the component that is unfinished with the same name. Check out the Sort Children component to see what it does.
+  // UPDATE_CHILDREN_SORT, --The reason why this is commented out is because of the unused reducer of the same name, for the component that is unfinished with the same name. Check out the Sort Children component to see what it does.
   CHANGE_IMAGE_SOURCE,
   DELETE_IMAGE
 } from '../actionTypes/index';
@@ -62,13 +55,9 @@ export const loadInitData = () => (dispatch: (arg: Action) => void) => {
   });
 };
 
-<<<<<<< HEAD
 export const addComponent = ({ title }: { title: string }) => (
-  dispatch: (arg: AddComponent) => void
+  dispatch: (arg: Action) => void
 ) => {
-=======
-export const addComponent = ({ title }: { title: string }) => (dispatch: (arg: Action) => void) => {
->>>>>>> 879a79ab127239023143128b74bc26e7034e561f
   dispatch({ type: ADD_COMPONENT, payload: { title } });
 };