From 43b5926b74c1c5afab95cb7fb9313c7dc42fcb1a Mon Sep 17 00:00:00 2001
From: funkyfranky <frank@inter-zone.de>
Date: Fri, 27 Oct 2017 22:08:16 +0200
Subject: [PATCH] Moose.lua

---
 Moose Mission Setup/Moose.lua | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index e76034f8a..b98fbb753 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,9 +1,5 @@
 env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
-<<<<<<< HEAD
-env.info( 'Moose Generation Timestamp: 20171027_1946' )
-=======
 env.info( 'Moose Generation Timestamp: 20171026_1116' )
->>>>>>> master
 
 local base = _G