Git merge conflict in chapter 18 (flyweight pattern)

📚 Official Books Design Patterns by Tutorials
1

At the bottom of chapter 18 (pages 265 and 266), the flyweight pattern, there is a git merge conflict.

<<<<<<< HEADFeel free to add functionality to YetiJokes and even change up the jokes! =======Feel free to add functionality to YetiJokes and even change up the jokes; you can only get so many laughs with dad puns!

2

@jstrawn Can you please help with this when you get a chance? Thank you - much appreciated! :]