Merge pull request #91 from Project516/master

fix

Author: Project516

app/src/main/resources/version.txt

@@ -1 +1 @@
-0.1.3
+rolling

debian-package/DEBIAN/control

@@ -1,16 +1,3 @@
-<<<<<<< HEAD
-Package: numberguessinggame
-Version: 0.1.3
-Section: games
-Priority: optional
-Architecture: all
-Depends: default-jre | java8-runtime
-Maintainer: project516 <[email protected]>
-Description: A simple number guessing game
- A simple number guessing game where you try to guess a randomly
- generated number. The game will tell you if your guess is too high
- or too low until you find the correct number.
-=======
 Package: numberguessinggame
 Version: 1.0.0
 Section: games
@@ -22,4 +9,3 @@ Description: A simple number guessing game
  A simple number guessing game where you try to guess a randomly
  generated number. The game will tell you if your guess is too high
  or too low until you find the correct number.
->>>>>>> parent of ad04a2e (readme fix)