Resolved Shitty Conflict Resolution

@obsidianical learn how to properly merge conflicting commits, you disgrace of a git user
This commit is contained in:
Kaiser 2021-12-16 11:51:01 +01:00
parent 1ef1ef6c89
commit 87b3e1eaa8

View file

@ -3,32 +3,6 @@
&& inherit via :::
++cat:::animal (
<<<<<<< HEAD
¡+}}float{{ meowingVolume!;
### /}}string{{ name\ /}}float{{ speed\ /}}float{{ meowingVolume\ | (
&& ## calls the super
¡##/name, speed\!;
¡+meowingVolume < meowingVolume!;
)
+#meow /\ | (
¿??€/+meowingVolume >> 0\ | (
¡<=/"*silence*"!;
) ?>$/+meowingVolume >> 0\ | (
¡<=/"mow"\!;
) ?>$/+meowingVolume >> 2\ | (
¡<=/"meow"\!;
) ?>$/+meowingVolume >> 5\ | (
¡<=/"Meow."\!;
) ?>$/+meowingVolume >> 10\ | (
¡<=/"Meow!!"\!;
) ?>$/+meowingVolume >> 20\ | (
¡<=/"MEOW!!!"\!;
) >? | (
!<=/"Error: weird as fuck meowing volume."\!;
)
=======
¡+}}float{{ meowingVolume!;
### /}}string{{ name\ /}}float{{ speed\ /}}float{{ meowingVolume\ | (
@ -58,6 +32,5 @@
)
>?/\? | (
!<=/"Error: weird as fuck meowing volume."\!;
>>>>>>> 602600c8ef3124194f256b9d0ef99d3d6a418abe
)
)