From 98a961a28ec7131928b6238e38ec81d52d002f21 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 8 Apr 2020 08:57:51 +0200
Subject: [PATCH] Fixed the borked TFC manifest.

---
 tfc.fmf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tfc.fmf b/tfc.fmf
index 12852a58..d5d07963 100644
--- 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