Skip to content

Commit

Permalink
Merge pull request #20 from whelk-io/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
zteater authored Feb 15, 2020
2 parents eeadac4 + d06abab commit 7a561c4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ jobs:
git config --local user.name ${{ secrets.BUILD_USERNAME }}
git pull
git merge origin/master
- name: Push changes
uses: ad-m/github-push-action@master
with:
branch: develop
github_token: ${{ secrets.GITHUB_TOKEN }}
git pull
git push
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>io.whelk.hy.phen</groupId>
<artifactId>whelk-hy-phen-a-tion</artifactId>
<version>0.0.12-RELEASE</version>
<version>0.0.13-RELEASE</version>
<name>Hy-phen-a-tion</name>
<description>Java OSS library for calculating syllables and hyphenation using Frank Liang's doctoral thesis.</description>
<url>https://github.com/whelk-io/hy-phen-a-tion</url>
Expand Down

0 comments on commit 7a561c4

Please sign in to comment.