True merge conflict?

DeltaV-Station · Nov 24, 2024 · af70edb · af70edb
2 parents 6dee3bf + 3a0ec3d
commit af70edb
Showing 1 changed file with 31 additions and 1 deletion.
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/healing.yml
@@ -1,3 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 - type: entity
   parent: Pill
   id: PillSoretizone
@@ -275,4 +305,4 @@
   - type: StorageFill
     contents:
     - id: PillAgonolexyne
-      amount: 5
+      amount: 5