resolve conflicts

2022-06-24 11:32:14 +02:00 · 2022-06-24 11:32:14 +02:00 · 1f85abc1e2
parent 18e051596c cd3439b3ac
commit 1f85abc1e2
2 changed files with 3 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,6 +9,8 @@ ml).

 ## testing
 - [changed] #302 add system uuid for check the identity of one device.
+
+## [2.2.0] - 2022-06-24
 - [changed] #304 change anchor of link devices lots.

 ## [2.2.0 rc2] - 2022-06-22
@ -18,7 +20,6 @@ ml).
 - [added] #303 Add export Lots.
 - [added] #303 Add export relating lots with devices.
 - [added] #303 To do possible add and remove one device in one lot transfer.
->>>>>>> testing

 ## [2.2.0 rc1] - 2022-06-07
 - [added] #212 Server side render parser Workbench Snapshots.
--- a/ereuse_devicehub/init.py
+++ b/ereuse_devicehub/init.py
@ -1 +1 @@
-__version__ = "2.2.0.rc1"
+__version__ = "2.2.0"