Update launchpads.rb

waterskier2007 · web-flow · commit 33c74dacc9c8 · 2017-07-11T00:55:21.000-04:00
diff --git a/data/launchpads.rb b/data/launchpads.rb
@@ -10,11 +10,7 @@
             region: 'Texas',
             latitude: 31.399045,
             longitude: -97.462644
-<<<<<<< HEAD
-        }
-=======
         },
->>>>>>> r-spacex/master
         engines_tested: [
             'Merlin',
             'Draco'
