From 1acdfc1798f3bc7a4cde9018ede24eecafaa6a41 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Thu, 12 Jan 2017 12:20:17 +0100 Subject: [PATCH] Ensure merge is done correctly --- Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua | 2 +- Moose Mission Setup/Moose.lua | 2 +- 2 files changed, 2 insertions(+), 2 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 544390cf6..07060d824 100644 --- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua +++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170112_1201' ) +env.info( 'Moose Generation Timestamp: 20170112_1219' ) local base = _G Include = {} diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index 544390cf6..07060d824 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170112_1201' ) +env.info( 'Moose Generation Timestamp: 20170112_1219' ) local base = _G Include = {}