From 9828a82629b271fa8091e4d6010e6a4bcd373da7 Mon Sep 17 00:00:00 2001
From: SyntaxRules <devyn.stott@gmail.com>
Date: Tue, 9 Nov 2021 22:18:35 -0700
Subject: [PATCH] chore(deps): make dependecies consistent with ^ operator

---
 package-lock.json | 24 +++++++++++++++++++++++-
 package.json      | 33 ++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48ec863..6549f0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,14 +9,20 @@
       "version": "1.9.1",
       "license": "BSD-3-Clause",
       "dependencies": {
+<<<<<<< HEAD
         "yargs": "17.2.1"
+=======
+        "jsdom": "^18.0.1",
+        "yargs": "^17.2.1"
+>>>>>>> 9c043d8 (chore(deps): make dependecies consistent with ^ operator)
       },
       "bin": {
         "showdown": "bin/showdown.js"
       },
       "devDependencies": {
-        "chai": "4.3.x",
+        "chai": "^4.3.4",
         "grunt": "^1.4.1",
+<<<<<<< HEAD
         "grunt-contrib-clean": "2.0.x",
         "grunt-contrib-concat": "2.0.x",
         "grunt-contrib-jshint": "3.1.x",
@@ -32,6 +38,22 @@
         "quiet-grunt": "0.2.x",
         "semver": "7.3.x",
         "semver-sort": "0.0.x",
+=======
+        "grunt-contrib-clean": "^2.0.0",
+        "grunt-contrib-concat": "^2.0.0",
+        "grunt-contrib-jshint": "^3.1.0",
+        "grunt-contrib-uglify": "^5.0.1",
+        "grunt-conventional-changelog": "^6.1.0",
+        "grunt-conventional-github-releaser": "^1.0.0",
+        "grunt-endline": "^0.7.0",
+        "grunt-eslint": "^24.0.0",
+        "grunt-simple-mocha": "^0.4.0",
+        "load-grunt-tasks": "^5.1.0",
+        "performance-now": "^2.1.0",
+        "quiet-grunt": "^0.2.0",
+        "semver": "^7.3.0",
+        "semver-sort": "^0.0.4",
+>>>>>>> 9c043d8 (chore(deps): make dependecies consistent with ^ operator)
         "sinon": "^12.0.1",
         "source-map-support": "^0.5.20"
       }
diff --git a/package.json b/package.json
index 0cf9af0..9ccd05c 100644
--- a/package.json
+++ b/package.json
@@ -39,28 +39,27 @@
     "showdown": "bin/showdown.js"
   },
   "devDependencies": {
-
-    "chai": "4.3.x",
+    "chai": "^4.3.4",
     "grunt": "^1.4.1",
-    "grunt-contrib-clean": "2.0.x",
-    "grunt-contrib-concat": "2.0.x",
-    "grunt-contrib-jshint": "3.1.x",
-    "grunt-contrib-uglify": "~5.0.1",
-    "grunt-conventional-changelog": "6.1.x",
-    "grunt-conventional-github-releaser": "1.0.x",
-    "grunt-endline": "0.7.x",
-    "grunt-eslint": "24.0.x",
-    "grunt-simple-mocha": "0.4.x",
+    "grunt-contrib-clean": "^2.0.0",
+    "grunt-contrib-concat": "^2.0.0",
+    "grunt-contrib-jshint": "^3.1.0",
+    "grunt-contrib-uglify": "^5.0.1",
+    "grunt-conventional-changelog": "^6.1.0",
+    "grunt-conventional-github-releaser": "^1.0.0",
+    "grunt-endline": "^0.7.0",
+    "grunt-eslint": "^24.0.0",
+    "grunt-simple-mocha": "^0.4.0",
     "jsdom": "^19.0.0",
-    "load-grunt-tasks": "5.1.x",
-    "performance-now": "2.1.x",
-    "quiet-grunt": "0.2.x",
-    "semver": "7.3.x",
-    "semver-sort": "0.0.x",
+    "load-grunt-tasks": "^5.1.0",
+    "performance-now": "^2.1.0",
+    "quiet-grunt": "^0.2.0",
+    "semver": "^7.3.0",
+    "semver-sort": "^0.0.4",
     "sinon": "^12.0.1",
     "source-map-support": "^0.5.20"
   },
   "dependencies": {
-    "yargs": "17.2.1"
+    "yargs": "^17.2.1"
   }
 }