Skip to content

Commit

Permalink
Merge pull request #1050 from support-project/merge_resources
Browse files Browse the repository at this point in the history
Merge resources
  • Loading branch information
koda-masaru authored Jun 30, 2018
2 parents 6cfd105 + 49a8c14 commit 7cf0bfc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/resources/appresource.properties
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ knowledge.view.comment.open=Open
knowledge.view.comment.collapsed=Collapsed
knowledge.view.comment.collapse.on=Collapsed
knowledge.view.comment.collapse.off=Opened
knowledge.view.info.insert={1} was written at {2}
knowledge.view.info.update={1} was updated at {2}
knowledge.view.info.insert=written by {1} at {2}
knowledge.view.info.update=updated by {1} at {2}
knowledge.view.info.history=History
knowledge.view.label.show.toc=Show TOC
knowledge.view.label.copy.url=Clip Page URL
Expand Down

0 comments on commit 7cf0bfc

Please sign in to comment.