Browse Source

[fixed] Unresolved conflict resolved

KevinSmarts 3 years ago
parent
commit
77d1070c5c
1 changed files with 0 additions and 5 deletions
  1. 0 5
      locations/gschool_break.qsrc

+ 0 - 5
locations/gschool_break.qsrc

@@ -277,13 +277,8 @@ if $ARGS[0] = 'girls_restroom_events':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
-!!<<<<<<< HEAD
-							'<center><img <<$set_imgh>> src="images/characters/shared/photos/big20.jpg"></center>'
-							'You turn and run for the door. As you make it through the door you hear Lena call after you, "Run all you want bitch, I will find and kick your ass, eventually"'
-!!=======
 							'<center><img <<$set_imgh>> src="images/characters/shared/photos/big20.jpg"></center>'
 							'You turn and run for the door. As you make it to the door you hear Lena call after you. "You can run all you want bitch, I will find you and kick your ass, eventually"'
-!!>>>>>>> hornguy6/master
 							act 'Continue': gt 'gschool_lessons', 'short_break'
 						end
 					else