Conflict resolution from JulienJaden merge

locations/tanhouse

@@ -50,51 +50,6 @@ if nik > 30 and niksvid = 2 and hour > 12 and hour < 19 and dayrazb < daystart:g
 	if tanwork = 1:
 		act 'Quit your Maid Job':
 			cla
-<<<<<<< HEAD
-			tanya = 0
-			'"I will not offer a second time, if you do not want to be around me, piss off." Tanya furiously pushes you out of the apartment.'
-
-			act 'Leave':gt 'down'
-		end
-
-		act 'Agree':
-		
-			if work = 1 and cheatWork = 0:
-				cla
-				tanya += 5
-				tanpred = 2
-				'"Okay, but first I need to quit"'
-				'"So what are you waiting for? Go now, run." Exclaims Tanya, happily.'
-
-				act 'Leave':gt 'down'
-			else
-				cla
-				tanya += 5
-				tanwork = 1
-				work = 1
-				'"Well, I agree."'
-				'"I''ll go and tell my stepfather." Exclaims Tanya, happily.'
-
-				act 'Leave':gt 'tanhouse', 'sex'
-			end
-		end
-	end
-else
-	'"Well, have you quit?"'
-
-	if (work = 0 or cheatWork = 1) and tanwork = 0:
-		tanwork = 1
-		work = 1
-		'"Yeah, I quit"'
-		'"I''ll go and tell my stepfather." Exclaims Tanya, happily.'
-
-		act 'Leave':gt 'tanhouse', 'sex'
-	else
-		'"Not yet"'
-		'"So what are you waiting for? Go now, run."'
-
-		act 'Leave':gt 'down'
-=======
 			'<font color=red>Are you sure? You won''t be able to live here anymore if you quit and there''s no telling how Tanya is going to react.</font>'
 			act '<font color=red>Yes, quit this job</font>':
 				tanuvol = 1
@@ -126,7 +81,6 @@ else
 				gt 'tanhouse'
 			end
 		end
->>>>>>> c1f9b80c2c3c5e04f04ab01fd4511605def44ded
 	end
 
 elseif $ARGS[0] = 'razb':
@@ -138,9 +92,9 @@ elseif $ARGS[0] = 'razb':
 	sex += 1
 	swallow += 1
 	spafinloc = 12
-gs 'cum_manage'
+	gs 'cum_manage'
 	spafinloc = 11
-gs 'cum_manage'
+	gs 'cum_manage'
 	lesbian += 1
 	dayrazb = daystart + 7
 	'<center><img src="images/img/th/h1.jpg"></center>'

locations/tankitchen

@@ -77,11 +77,7 @@ if tanwork = 1 and $clothingworntype = 'uniform' and PCloStyle2 = 1 and TanMadeB
 						nik += 2
 						spafinloc = 12
 						gs 'cum_manage'
-<<<<<<< HEAD:locations/kitchen
 						stat['bj'] += 1
-=======
-						bj += 1
->>>>>>> c1f9b80c2c3c5e04f04ab01fd4511605def44ded:locations/tankitchen
 						guy += 1
 						'<center><img src="images/img/centr/kitchenminet.jpg"></center>'
 						'You get on your knees and from his pants is released his huge cock. Licking the head, you open your mouth and sucking diligently, try to tighten your lips and take it as far as possible.'