filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-27 09:31:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[TMP] merge_helpers.sh: Hardcode develop branch"

Browse Source 
This reverts commit d13494aa67e1384eba474b0a0febe8419c795794.
This commit is contained in:
SpiritCroc 2022-12-15 11:02:24 +01:00
parent 6fc5f6d378
commit f6801a5be0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge_helpers.sh
View File

@ -73,8 +73,7 @@ upstream_common_base() {
# commit="$merged_main"
#else
>&2 echo "ERROR: don't know how to compare main and develop upstream branches"
commit="$merged_develop"
#exit 1
exit 1
#fi
fi
echo "$commit"