I felt angry, but her smile disarmed me.

• 我动气了，但她一笑，又将我的气儿给消了。