From 61019659569708fceb2ddefe9ed63fc0e344407e Mon Sep 17 00:00:00 2001 From: Grey-Echo Date: Mon, 27 Mar 2017 12:19:26 +0200 Subject: [PATCH] Generate Moose Static --- .../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 907886cd8..d32411e0b 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: 20170327_1206' ) -======= -env.info( 'Moose Generation Timestamp: 20170327_1033' ) ->>>>>>> master +env.info( 'Moose Generation Timestamp: 20170327_1219' ) local base = _G Include = {} diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index 907886cd8..d32411e0b 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: 20170327_1206' ) -======= -env.info( 'Moose Generation Timestamp: 20170327_1033' ) ->>>>>>> master +env.info( 'Moose Generation Timestamp: 20170327_1219' ) local base = _G Include = {}