diff --git a/Moose Development/Moose/Functional/Sead.lua b/Moose Development/Moose/Functional/Sead.lua index 420ec1a7e..be481e01d 100644 --- a/Moose Development/Moose/Functional/Sead.lua +++ b/Moose Development/Moose/Functional/Sead.lua @@ -16,9 +16,15 @@ -- === -- -- ### Authors: **FlightControl**, **applevangelist** +<<<<<<< Updated upstream -- -- Last Update: Feb 2021 -- +======= +-- +-- Last Update: April 2021 +-- +>>>>>>> Stashed changes -- === -- -- @module Functional.Sead