1
0
Pārlūkot izejas kodu

[fixed] conflict resolution

Kevin_Smarts 7 mēneši atpakaļ
vecāks
revīzija
97dc083f06
1 mainītis faili ar 0 papildinājumiem un 19 dzēšanām
  1. 0 19
      locations/korrPar.qsrc

+ 0 - 19
locations/korrPar.qsrc

@@ -45,34 +45,15 @@ act '<b>Leave and go to the stairwell</b>':
 		msg'<b><font color = red>You need to get dressed.</font></b>'
 		gt 'korrPar'
 	end
-<<<<<<< HEAD
 end
 
 act '<b>Leave and go to the courtyard</b>':
 	if $clothingworntype ! 'nude':
 		if hour < 5 and motherWorry = 0 and age < 18 and locat['Fam_inGad'] = 0:
-=======
-else
-	act '<b>Leave and go to the stairwell</b>':
-		killvar '$default_img_path' 
-		killvar '$mother_img_path'
-		minut += 5
-		gt'pod_ezd','etaj_2'
-	end
-	act '<b>Leave and go to the courtyard</b>':
-		if hour < 5 and motherWorry = 0 and age < 18 and locat['Fam_inGad'] = 0:
-			*nl
->>>>>>> 78f561e5220e67114c661442038e69470332640e
 			'<font color=red>Are you sure? Your mother will worry.</b></font>'
 			cla
 			act '<font color=red><b>Yes, go outside</b></font>': 
 				minut += 5 
-<<<<<<< HEAD
-=======
-				!! Reset vars - temp until other parts of game migrated
-				killvar '$default_img_path'
-				killvar '$mother_img_path'
->>>>>>> 78f561e5220e67114c661442038e69470332640e
 				gt'pav_complex', 'start'
 			end
 			act 'No, stay inside':gt 'korrPar'