i REALLY hate git
This commit is contained in:
parent
7538ee2326
commit
6e1ae720b1
1 changed files with 0 additions and 3 deletions
|
@ -8,8 +8,5 @@ minecraftVersion=1.18.2
|
|||
modVersion=0.8.0
|
||||
forgeVersion=40.1.0
|
||||
paucalVersion=0.3.4
|
||||
<<<<<<< HEAD
|
||||
patchouliVersion=66
|
||||
jeiVersion=9.5.3.143
|
||||
=======
|
||||
>>>>>>> 7392a7276cecabd34143e632dff3024777dbeeb6
|
||||
|
|
Loading…
Reference in a new issue