English

subjects/fromto/README.md

@@ -2,24 +2,12 @@
 
 ### Instructions
 
-- Write a function that takes two `integers` and returns a `string` representing the range of numbers from the first to the second.
-- The function can return the numbers in any order.
-- The number must be separated by a comma and a space.
-<<<<<<< HEAD
+Write a function that takes two `integers` and returns a `string` showing the range of numbers from the first to the second.
 
-- If any of the arguments is bigger than 99 or less than 0, the function returns `"invalid"` followed by a newline (`'\n'`).
-
-- Add `0` at the first of any number if it is less than 10.
-
-=======
-- If any of the arguments is bigger than 99 or less than 0, the function returns `"invalid"` followed by a newline (`'\n'`).
-<<<<<<< HEAD
-- Add `0` at the first of any number if it is less than 10.  
->>>>>>> docs(fromto):delete space
-=======
-- Add `0` at the first of any number if it is less than 10.
->>>>>>> style(fromto): white-space, formmating
-- Add a new line (`'\n'`) at the end of the string.
+- The numbers must be separated by a comma and a space.
+- If any of the arguments is bigger than `99` or less than `0`, the function returns `Invalid` followed by a newline `\n`.
+- Prepend a `0` to any number that is less than `10`.
+- Add a new line `\n` at the end of the `string`.
 
 ### Expected function
 
@@ -48,6 +36,7 @@ func main() {
 	fmt.Print(piscine.FromTo(100, 10))
 }
 ```
+
 And its output:
 
 ```console