Skip to content
Snippets Groups Projects
Commit cfe616a4 authored by timmolter's avatar timmolter
Browse files

Merge branch 'master' into develop 

Conflicts:
	pom.xml
parents 294cec1c 6d57b92c
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
README.md
+ 1
− 1
View file @ cfe616a4
...@@ -39,7 +39,7 @@ Add this to dependencies in pom.xml: ...@@ -39,7 +39,7 @@ Add this to dependencies in pom.xml:
<dependency> <dependency>
<groupId>com.xeiam</groupId> <groupId>com.xeiam</groupId>
<artifactId>xchart</artifactId> <artifactId>xchart</artifactId>
<version>1.1.0</version> <version>1.2.0</version>
</dependency> </dependency>
Building Building
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment