chores: Update CHANGELOG and dev tag script

supertokens · Sep 1, 2023 · c054f5d · c054f5d
1 parent 1076503
commit c054f5d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-## [0.10.5] - 2023-09-30
+## [0.10.5] - 2023-09-01
 
 - Add logic to retry network calls if the core returns status 429
 

diff --git a/addDevTag b/addDevTag
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# check if we need to merge master into this branch------------
-if [[ $(git log origin/master ^HEAD) ]]; then
-    echo "You need to merge master into this branch. Exiting"
-    exit 1
-fi
-
 # get version------------
 version=`cat setup.py | grep -e 'version='`
 while IFS='"' read -ra ADDR; do
@@ -86,4 +80,4 @@ fi
 
 git tag dev-v$version $commit_hash
 
-git push --tags
+git push --tags