fix version

This commit is contained in:
Isaac Connor 2017-05-10 13:39:03 -04:00
parent b684ee5ad5
commit e5030ff998
1 changed files with 0 additions and 4 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
1.31.0
=======
1.30.4
>>>>>>> master