Skip to content

Commit

Permalink
Merge remote-tracking branch 'yarg.github/master' into github
Browse files Browse the repository at this point in the history
Conflicts:
	core/test/sample/incomes/IncomesTest.java
  • Loading branch information
tinhol committed Oct 21, 2013
2 parents d2fd6ee + f55e290 commit 502d080
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ Provided by Haulmont Tech.

This is a simple library for fast report creation

You can see first sample of usage in /core/test/sample/IncomesTest.java
You can see first sample of usage in [IncomesTest](/core/test/sample/IncomesTest.java)

To be continued...

0 comments on commit 502d080

Please sign in to comment.