Index: /WAeUP_SRP/trunk/skins/waeup_student/check_admission.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/check_admission.py	(revision 999)
+++ /WAeUP_SRP/trunk/skins/waeup_student/check_admission.py	(revision 1000)
@@ -48,22 +48,4 @@
 elif psm == 'valid':
     s_id = ds.get('s_id')
-<<<<<<< .mine
-    if is_anon and not s_id:
-        return context.check_admission_pin_form(rendered = res,
-                                 psm = "You are not allowed to do this in this context",
-                                 #psm = "%s, %s" % (psm,ds),
-                                 firstlayout = True,
-                                 lastlayout = True,
-                                 ds = ds,
-                                 )
-    elif not is_anon:
-        return context.check_admission_pin_form(rendered = res,
-                                 psm = "You are logged in",
-                                 #psm = "%s, %s" % (psm,ds),
-                                 firstlayout = True,
-                                 lastlayout = True,
-                                 ds = ds,
-                                 )
-=======
     if is_anon and not s_id:
         return context.check_admission_pin_form(rendered = res,
@@ -82,5 +64,4 @@
                                  ds = ds,
                                  )
->>>>>>> .r998
 ##  
 ##    email = ds.get('app_email')
Index: /WAeUP_SRP/trunk/skins/waeup_student/search_students.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/search_students.py	(revision 999)
+++ /WAeUP_SRP/trunk/skins/waeup_student/search_students.py	(revision 1000)
@@ -143,5 +143,5 @@
 else:
     all = search_set
-for a in all:
+for a in all[:100]:
     if a in items:
         continue
