Skip to content

Commit

Permalink
Solved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
hfedcba committed Jun 23, 2018
2 parents a5d6e7c + 9b8039c commit ec4bbbe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion getVersion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ done
rm -f contributors*

revision=$(($revision1 + $revision2))
echo 0.7.22-$revision
echo 0.7.23-$revision

0 comments on commit ec4bbbe

Please sign in to comment.