update

italojsoliveira · Dec 15, 2023 · 9347a9e · 9347a9e
1 parent c28a58d
commit 9347a9e
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -19,16 +19,8 @@ Write a program that reads the user name as an input and outputs a welcome messa
   <summary>Click here to see a possible solution</summary>
 
     user_name = input('Write your first name: ')
-<<<<<<< HEAD
     print('Welcome,', user_name, '!')
     print('Welcome, {}!'.format(user_name))
-
-=======
-
-    print('Welcome,', user_name, '!')
-
-    print('Welcome, {}!'.format(user_name))
->>>>>>> 5aa23be429708f01b99b83ebe0cfaeeee3a4f3d4
 </details>
 
 #### Exercise 2