Skip to content
Success

Changes

Summary

  1. fix manual merge derps (details)
Commit faedd83413c4463271ee6940650a671c00d7f37e by progwml6
fix manual merge derps
The file was modifiedsrc/main/java/tconstruct/common/TRecipes.java (diff)
The file was modifiedsrc/main/java/tconstruct/common/TContent.java (diff)