erik/kobalt-line-count
erik/kobalt-line-count
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt-line-count.git synced 2025-04-25 11:17:10 -07:00
Code Releases Activity

Merge branch 'master' of github.com:cbeust/kobalt-line-count

Browse source 
Conflicts:
	kobalt/Build.kt.iml
	kobalt/wrapper/kobalt-wrapper.properties
This commit is contained in:
Cedric Beust 2016-02-16 17:15:47 -08:00
commit 78b0b73374
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1,5 @@
kobalt.version=0.605
<<<<<<< HEAD
kobalt.version=0.605
=======
kobalt.version=0.390
>>>>>>> 6863392c7dbb354504b955000ced270f22d307be