diff options
| author | angstsmurf | 2016-10-18 02:58:19 +0200 |
|---|---|---|
| committer | angstsmurf | 2016-10-18 02:58:19 +0200 |
| commit | 17f3626214d3244bfe07b4f263c99be2de07a289 (patch) | |
| tree | 48bca830bc142505dad7f378c7cac7c9531f0cc9 /engines/composer | |
| parent | a946e9eab95201d4ee3dd0d4eaeb3a088fb819fe (diff) | |
| download | scummvm-rg350-17f3626214d3244bfe07b4f263c99be2de07a289.tar.gz scummvm-rg350-17f3626214d3244bfe07b4f263c99be2de07a289.tar.bz2 scummvm-rg350-17f3626214d3244bfe07b4f263c99be2de07a289.zip | |
COMPOSER: Delete leftover git conflict marker
Diffstat (limited to 'engines/composer')
| -rw-r--r-- | engines/composer/composer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/composer/composer.h b/engines/composer/composer.h index 9ae1c1dfbe..a4b421bfa0 100644 --- a/engines/composer/composer.h +++ b/engines/composer/composer.h @@ -29,7 +29,6 @@ #include "common/debug.h" #include "common/debug-channels.h" #include "common/error.h" -======= #include "common/serializer.h" #include "common/textconsole.h" #include "common/rect.h" |