From 6923cfe143c9aa865f4255dac3fd8f9aa35acb93 Mon Sep 17 00:00:00 2001
From: funkyfranky <frank@inter-zone.de>
Date: Tue, 24 Oct 2017 23:16:04 +0200
Subject: [PATCH] moose.lua

---
 Moose Mission Setup/Moose.lua | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index 15e738d18..4bd75d8e6 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: 20171021_1218' )
-=======
-env.info( 'Moose Generation Timestamp: 20171023_1007' )
->>>>>>> master
+env.info( 'Moose Generation Timestamp: 20171024_2314' )
 
 local base = _G