6 lines
94 B
Properties
6 lines
94 B
Properties
<<<<<<< HEAD
|
|
releaseVersion=1.8.0.DEVELOP
|
|
=======
|
|
releaseVersion=1.7.1.RELEASE
|
|
>>>>>>> master
|