FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

static moose.lua

Browse Source
This commit is contained in:
FlightControl 2017-03-23 05:29:44 +01:00
parent 63973e4e2d
commit c4ba4760fc
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
View File

@ -1,9 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' ) env.info( '*** MOOSE STATIC INCLUDE START *** ' )
<<<<<<< HEAD env.info( 'Moose Generation Timestamp: 20170323_0529' )
env.info( 'Moose Generation Timestamp: 20170322_2149' )
=======
env.info( 'Moose Generation Timestamp: 20170322_1812' )
>>>>>>> refs/remotes/origin/master
local base = _G local base = _G
Include = {} Include = {}

6
Moose Mission Setup/Moose.lua
View File

@ -1,9 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' ) env.info( '*** MOOSE STATIC INCLUDE START *** ' )
<<<<<<< HEAD env.info( 'Moose Generation Timestamp: 20170323_0529' )
env.info( 'Moose Generation Timestamp: 20170322_2149' )
=======
env.info( 'Moose Generation Timestamp: 20170322_1812' )
>>>>>>> refs/remotes/origin/master
local base = _G local base = _G
Include = {} Include = {}