update README.md and fix merge conflicts
This commit is contained in:
parent
fc61de748d
commit
1ff0ede6cd
@ -4,13 +4,8 @@
|
||||
|
||||
# Description
|
||||
This repository contains all the mods running on lobotomy land, their associated links, and their descriptions - it shouldn't update often.
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
# Major Content
|
||||
=======
|
||||
## Major Content
|
||||
>>>>>>> 3959f799a31f6a068dd47e0367d9745e2849cffe
|
||||
|
||||
### [Create](https://modrinth.com/mod/create-fabric)
|
||||
Create mod base. Adds far too many features to cover here.
|
||||
|
Reference in New Issue
Block a user