From c045ba0c6d48769e183e5a5c8c60da6b925f8e02 Mon Sep 17 00:00:00 2001
From: Applevangelist <72444570+Applevangelist@users.noreply.github.com>
Date: Sun, 2 May 2021 11:35:30 +0200
Subject: [PATCH] Update Sead.lua

---
 Moose Development/Moose/Functional/Sead.lua | 6 ------
 1 file changed, 6 deletions(-)

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