fixed merge conflicts

Author: katherinek123

src/components/composables/useCreateComponent.js

@@ -43,7 +43,7 @@ export function useCreateComponent(importObj) {
       isActive: false,
       color: "#ffffff85",
       htmlAttributes:{
-        class:"test",
+        class:"",
         id:"",
       }
     };

src/components/right-sidebar/CodeSnippet.vue

@@ -76,9 +76,16 @@ export default {
     // Creates beginner boilerplate
     createTemplate(componentName) {
       let templateTagStr = this.writeTemplateTag(componentName);
+<<<<<<< HEAD
       if (this.activeComponentObj.htmlAttributes.class !== "") return `<template>\n  <div class = "${this.activeComponentObj.htmlAttributes.class}">\n${templateTagStr}  </div>\n</template>`;
       else return `<template>\n  <div>\n${templateTagStr}  </div>\n</template>`;
 
+=======
+      console.log(this.activeComponentObj)
+        // if(this.activeComponentObj.htmlAttributes.class !== "") return `<template>\n  <div class = "${this.activeComponentObj.htmlAttributes.class}">\n${templateTagStr}  </div>\n</template>`;
+        //   else return `<template>\n  <div>\n${templateTagStr}  </div>\n</template>`;
+      
+>>>>>>> d43111c7d7f70bf069d8763816730ae516810d3f
     },
     // Creates <template> boilerplate
     writeTemplateTag(componentName) {

src/store/mutations.js

@@ -489,6 +489,7 @@ const mutations = {
       isActive,
       actions,
       props,
+      htmlAttributes,
     } = payload;
     const s = payload.state;
     state.componentMap = {
@@ -507,6 +508,7 @@ const mutations = {
         actions,
         props,
         state: s,
+        htmlAttributes,
       },
     };
   },