Fixed the borked TFC manifest.

2020-04-08 08:57:51 +02:00 · 2020-04-08 08:57:51 +02:00 · 98a961a28e
parent bf48be3650
commit 98a961a28e
1 changed files with 0 additions and 4 deletions
--- a/tfc.fmf
+++ b/tfc.fmf
@ -1,12 +1,8 @@
 FTEMANIFEST 1
 GAME tfc
 NAME "Team Fortress"
-<<<<<<< HEAD
 BASEGAME platform
 BASEGAME logos
-=======
-BASEGAME nuclide
->>>>>>> 0246a10b124be549d1bdbce3a96c8619ad29c9ec
 BASEGAME tfc

 // custom game menu variables