From 4b74d1b724133af328e49f9045e265e2ec7f5103 Mon Sep 17 00:00:00 2001
From: FlightControl_Master <sven.van.de.velde@telenet.be>
Date: Mon, 9 Oct 2017 14:47:06 +0200
Subject: [PATCH] Update

---
 Moose Mission Setup/Moose.lua  | 6 +-----
 Moose Mission Setup/Moose_.lua | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index 040cd250d..a1ae2c475 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: 20171006_1917' )
-=======
-env.info( 'Moose Generation Timestamp: 20171007_2213' )
->>>>>>> master
+env.info( 'Moose Generation Timestamp: 20171009_1446' )
 
 local base = _G
 
diff --git a/Moose Mission Setup/Moose_.lua b/Moose Mission Setup/Moose_.lua
index 0de3e8160..92d010362 100644
--- a/Moose Mission Setup/Moose_.lua	
+++ b/Moose Mission Setup/Moose_.lua	
@@ -1,5 +1,5 @@
 env.info('*** MOOSE DYNAMIC INCLUDE START *** ')
-env.info('Moose Generation Timestamp: 20171007_2213')
+env.info('Moose Generation Timestamp: 20171009_1446')
 local base=_G
 __Moose={}
 __Moose.Include=function(IncludeFile)