* merge from master

tesirm99 · Jul 23, 2024 · daaef1a · daaef1a
2 parents 82d1ced + f405dfa
commit daaef1a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,13 +1,7 @@
 {
-<<<<<<< HEAD
-  "name": "@tweedegolf/storage-abstraction",
-  "version": "2.1.5",
-  "description": "Provides an abstraction layer for interacting with a storage; the storage can be local or in the cloud.",
-=======
   "name": "@tesirm/storage-abstraction",
   "version": "2.1.3",
   "description": "This is a fork of @tweedegolf's storage-abstraction package. It is a library that provides a common interface for interacting with various cloud storage providers.",
->>>>>>> 07d3d99 (modified package.jsons to publish my own package)
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "homepage": "https://github.com/tesirm99/storage-abstraction/",

diff --git a/publish/AdapterLocal/package.json b/publish/AdapterLocal/package.json
@@ -1,13 +1,7 @@
 {
-<<<<<<< HEAD
-  "name": "@tweedegolf/sab-adapter-local",
-  "version": "1.0.7",
-  "description": "Provides an abstraction layer for interacting with local storage on your local machine or on your server.",
-=======
   "name": "@tesirm/sab-adapter-local",
   "version": "1.0.6",
   "description": "This is a fork of @tweedegolf's package. It provides an abstraction layer for interacting with local storage on your local machine or on your server.",
->>>>>>> 07d3d99 (modified package.jsons to publish my own package)
   "main": "dist/index/AdapterLocal.js",
   "types": "dist/index/AdapterLocal.d.ts",
   "homepage": "https://github.com/tesirm99/storage-abstraction/",