\#1 Fix app neodevelop.rb

makingdevs · May 21, 2020 · fb49e2b · fb49e2b
1 parent 1d86bfe
commit fb49e2b
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/app_neodevelop.rb b/app_neodevelop.rb
@@ -1,11 +1,5 @@
 require 'sinatra'
 
-<<<<<<< HEAD
-get '/' do 
-	'Hello world!!!!'
-end
-=======
 get '/' do
   'Hello world!!!!'
 end
->>>>>>> f74b5aa945412cd12574219d83d7acafe01a5eab