chore: release v3.1.0

- (foxriver76) provide `esm` and `cjs` exports
ioBroker · Apr 16, 2024 · 8ffcd6a · 8ffcd6a
1 parent 603498f
commit 8ffcd6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -113,20 +113,17 @@ If you find errors in the definitions, e.g. function calls that should be allowe
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
-<<<<<<< HEAD
-### **WORK IN PROGRESS**
+### 3.1.0 (2024-04-16)
 
 -   (foxriver76) provide `esm` and `cjs` exports
 
-=======
 ### 3.0.6 (2024-03-24)
 
 - (foxriver76) hotfix previous release: compatibility with next controller with new esm/cjs exports
 
 ### 3.0.5 (2024-03-24)
 
 - (foxriver76) compatibility with next controller with new esm/cjs exports
->>>>>>> 729e73b2947c360e75c2b4a1c6323e0a8688584b
 
 ### 3.0.4 (2023-10-12)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-core",
-  "version": "3.0.6",
+  "version": "3.1.0",
   "description": "Core module to be used in ioBroker adapters. Acts as the bridge to js-controller.",
   "engines": {
     "npm": ">=7.0.0"