package.json merge conflict and update

frankpagan · frankpagan · commit de207d52dea4 · 2021-01-25T21:20:37.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,8 @@
+# 1.0.0 (2021-01-24)
+
+
+### Features
+
+* Initial Release ([3af2170](https://github.com/CoCreate-app/CoCreate-calculations/commit/3af2170b082c070feab2c5af5f00a7abd92f6250))
+
 # CHANGELOG
- 
diff --git a/andrei.html b/andrei.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
+    <title>Document</title>
+</head>
+<body>
+    <div class="container">
+        <div class="row d-flex">
+            <div class="col-md-3 col-sm-6 py-1">
+                <div class="justify-content-center text-center" style="background-color: blue; height: 100px;"><h1 class="text-danger" style="padding-top: 20px;">1</h1></div>
+            </div>
+            <div class="col-md-3 col-sm-6 py-1">
+                <div class="justify-content-center text-center" style="background-color: blue; height: 100px;"><h1 class="text-danger" style="padding-top: 20px;">2</h1></div>
+            </div>
+            <div class="col-md-3 col-sm-6 py-1">
+                <div class="justify-content-center text-center" style="background-color: blue; height: 100px;"><h1 class="text-danger" style="padding-top: 20px;">3</h1></div>
+            </div>
+            <div class="col-md-3 col-sm-6 py-1">
+                <div class="justify-content-center text-center" style="background-color: blue; height: 100px;"><h1 class="text-danger" style="padding-top: 20px;">4</h1></div>
+            </div>
+        </div>
+        
+    </div>
+    
+</body>
+</html>
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@cocreate/calculations",
   "version": "1.0.0",
   "description": "A simple calculation component in vanilla javascript. Easy configuration using data-attributes and/or JavaScript API. Great for getting values from multiple elements and calculating to produce a result.",
-  "keywords": ["cocreate","no-code-framework","cocreatejs","cocreatejs-component","cocreate-framework","no-code","low-code","collaborative-framework","realtime","realtime-framework","collaboration","shared-editing","html5-framework","javascript-framework"],
+  "keywords": ["calculation","calculate-values","calculate-total","cocreate","no-code-framework","cocreatejs","cocreatejs-component","cocreate-framework","no-code","low-code","collaborative-framework","realtime","realtime-framework","collaboration","shared-editing","html5-framework","javascript-framework"],
   "publishConfig": {
     "access": "public"
   },
@@ -32,7 +32,6 @@
     "webpack-cli": "^4.3.1",
     "webpack-log": "^3.0.1"
   },
-
   "dependencies": {
     "@cocreate/docs": "^1.0.3"
   }
