@@ -577,13 +577,9 @@ end
if $ARGS[0] = 'assessment':
*clr & cla
$location_type = 'public_indoors'
-<<<<<<< Updated upstream
+
gs 'themes', 'indoors'
- ! Dance exam
-=======
- gs 'themes', 'indoors'
!! Dance exam
->>>>>>> Stashed changes
balletqw['school'] = 1
pcs_sleep -= rand(10,20)
