Remove merge comment & unrelated ch7-review.txt

This commit is contained in:
2021-10-10 09:02:58 +11:00
parent 18bed394f5
commit dc74629aad
2 changed files with 0 additions and 48 deletions

View File

@ -336,15 +336,6 @@ image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizon
image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True)
image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
#double surprised
#<<<<<<< B's
#image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
#=======
#image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
#image naser surprised = "naser/naserintermediaryshocked.png"
#
#>>>>>>> N's
#other flips
image spears happy flip = im.Flip("spears/spears happy.png", horizontal=True)
image fang flip off happy flip = im.Flip("fang/emotive set/fang flip off happy.png", horizontal=True)