Finalize Pulls & Merges

Carnations-Botanica · Sep 16, 2024 · 2b44120 · 2b44120
1 parent 020b3f3
commit 2b44120
Showing 1 changed file with 46 additions and 34 deletions.
diff --git a/docs/03-Changelog/index.md b/docs/03-Changelog/index.md
@@ -37,20 +37,44 @@ All notable changes to this project will be documented in this file. The format
 
 ---
 
-<<<<<<< HEAD
-## Touch up Color Scheme
+## Added visual explanations for downloading recovery using gibMacRecovery
 ### Prerelease@CarnationsInternal
-#### By RoyalGraphX
+#### By tammo03
 
 ## [1.0.0~prerelease] - 2024-09-16
 
 ### Added
+- Added informations about gibMacRecovery and its usage - general information about the recovery enviroment is still needed.
+
+### Changed
+-
+
+### Fixed
 -
 
+### Deprecated
+-
+
+### Removed
+- Windows and Linux section - there's no point in having both since gibMacRecovery is a cross-platform script
+- Buttons - they will have to be added again.
+
+### Security
+-
+
+---
+
+## Added visual explanations for downloading and Using ProperTree
+### Prerelease@CarnationsInternal
+#### By tammo03
+
+## [1.0.0~prerelease] - 2024-09-16
+
+### Added
+- Added explanations and assets for taking snapshots, downloading ProperTree and using it properly
+
 ### Changed
-- Updated Footer text
-- Custom CSS has been updated
-- YML Configuration has been updated
+-
 
 ### Fixed
 -
@@ -66,7 +90,7 @@ All notable changes to this project will be documented in this file. The format
 
 ---
 
-## No Rebase Attempt, Changelog affected.
+## Touch up Color Scheme
 ### Prerelease@CarnationsInternal
 #### By RoyalGraphX
 
@@ -76,7 +100,9 @@ All notable changes to this project will be documented in this file. The format
 -
 
 ### Changed
-- Reordered structure after no rebase git pull.
+- Updated Footer text
+- Custom CSS has been updated
+- YML Configuration has been updated
 
 ### Fixed
 -
@@ -92,31 +118,17 @@ All notable changes to this project will be documented in this file. The format
 
 ---
 
-## Update README.md, index.md, and About page.
+## No Rebase Attempt, Changelog affected.
 ### Prerelease@CarnationsInternal
 #### By RoyalGraphX
 
-## [1.0.0~prerelease] - 2024-09-15
+## [1.0.0~prerelease] - 2024-09-16
 
 ### Added
 -
 
 ### Changed
-- README.md for GitHub has been given a nice base layout for starters.
-- index.md for Docs has had its wording around invitation to Discord fixed.
-- Welcome Area -> About has a new entry.
-=======
-## Added visual explanations for downloading recovery using gibMacRecovery
-### Prerelease@CarnationsInternal
-#### By Tammo
-
-## [Version~Type] - 2024-09-16
-
-### Added
-- Added informations about gibMacRecovery and its usage - general information about the recovery enviroment is still needed.
-
-### Changed
--
+- Reordered structure after no rebase git pull.
 
 ### Fixed
 -
@@ -125,26 +137,26 @@ All notable changes to this project will be documented in this file. The format
 -
 
 ### Removed
-- Windows and Linux section - there's no point in having both since gibMacRecovery is a cross-platform script
-- Buttons - they will have to be added again.
+-
 
 ### Security
 -
 
 ---
 
-## Added visual explanations for downloading and Using ProperTree
+## Update README.md, index.md, and About page.
 ### Prerelease@CarnationsInternal
-#### By Tammo
+#### By RoyalGraphX
 
-## [Version~Type] - 2024-09-16
+## [1.0.0~prerelease] - 2024-09-15
 
 ### Added
-- Added explanations and assets for taking snapshots, downloading ProperTree and using it properly
-
-### Changed
 -
->>>>>>> 289aa96f3451e165df482e5e15a26d74323c5751
+
+### Changed
+- README.md for GitHub has been given a nice base layout for starters.
+- index.md for Docs has had its wording around invitation to Discord fixed.
+- Welcome Area -> About has a new entry.
 
 ### Fixed
 -