Skip to content

Commit

Permalink
Fix merge issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
LankLTE committed Jul 31, 2024
1 parent 11aa3a1 commit c14ac64
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,7 @@
description: A fragile crystal plant with lot of spiky thorns.
components:
- type: Item
size: Small
size: 5
sprite: Objects/Specific/Hydroponics/glasstle.rsi
heldPrefix: produce
- type: FlavorProfile
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Misc/paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@
enum.PaperUiKey.Key:
type: PaperBoundUserInterface
- type: Item
size: Tiny
size: 1
- type: Tag
tags:
- Trash
Expand Down

0 comments on commit c14ac64

Please sign in to comment.