From b3f7ba7006617d282e57bf4f1433e4128288eaae Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sat, 16 Mar 2024 15:46:48 -0700 Subject: [PATCH] fix LEGAL merge conflict --- LEGAL.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/LEGAL.md b/LEGAL.md index f5b4c7de3e..37dc5e7053 100644 --- a/LEGAL.md +++ b/LEGAL.md @@ -1,8 +1,4 @@ -<<<<<<< HEAD # Legal Info -======= -# Legal Info ->>>>>>> 42e9a271ff3925ecfeaf493f8fffef7332f526a2 ## Copyright