From c4ba4760fc88753633541c90a28ab81745df903e Mon Sep 17 00:00:00 2001
From: FlightControl <sven.van.de.velde@telenet.be>
Date: Thu, 23 Mar 2017 05:29:44 +0100
Subject: [PATCH] static moose.lua

---
 .../Moose Mission Update/l10n/DEFAULT/Moose.lua             | 6 +-----
 Moose Mission Setup/Moose.lua                               | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
index fba4cb4f3..fadf317fb 100644
--- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua	
+++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua	
@@ -1,9 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
-<<<<<<< HEAD
-env.info( 'Moose Generation Timestamp: 20170322_2149' ) 
-=======
-env.info( 'Moose Generation Timestamp: 20170322_1812' ) 
->>>>>>> refs/remotes/origin/master
+env.info( 'Moose Generation Timestamp: 20170323_0529' ) 
 local base = _G
 
 Include = {}
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index fba4cb4f3..fadf317fb 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,9 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
-<<<<<<< HEAD
-env.info( 'Moose Generation Timestamp: 20170322_2149' ) 
-=======
-env.info( 'Moose Generation Timestamp: 20170322_1812' ) 
->>>>>>> refs/remotes/origin/master
+env.info( 'Moose Generation Timestamp: 20170323_0529' ) 
 local base = _G
 
 Include = {}