Fixed forgotten merge

Author: Anna Gringauze

webdev/pubspec.yaml

@@ -1,10 +1,6 @@
 name: webdev
 # Every time this changes you need to run `pub run build_runner build`.
-<<<<<<< HEAD
-version: 2.7.5-dev
-=======
 version: 2.8.0-dev
->>>>>>> dfd0107 (Hide using debug symbols under a flag, update versions and changelog)
 # We should not depend on a dev SDK before publishing.
 # publish_to: none
 homepage: https://github.com/dart-lang/webdev