head 1.11; access; symbols; locks; strict; comment @# @; 1.11 date 2006.07.04.23.45.48; author LJDavidsonAdmin; state Exp; branches; next 1.10; 1.10 date 2006.06.30.00.08.22; author MeredithLesly; state Exp; branches; next 1.9; 1.9 date 2006.06.29.18.26.55; author MeredithLesly; state Exp; branches; next 1.8; 1.8 date 2006.06.29.17.53.30; author MeredithLesly; state Exp; branches; next 1.7; 1.7 date 2006.06.27.15.41.38; author AdaLio; state Exp; branches; next 1.6; 1.6 date 2006.06.27.15.05.53; author LarryDavidson; state Exp; branches; next 1.5; 1.5 date 2006.06.27.15.00.13; author KamilSupronik; state Exp; branches; next 1.4; 1.4 date 2006.06.27.09.50.13; author MeredithLesly; state Exp; branches; next 1.3; 1.3 date 2006.06.16.20.32.10; author LJDavidsonAdmin; state Exp; branches; next 1.2; 1.2 date 2006.06.15.18.35.36; author MeredithLesly; state Exp; branches; next 1.1; 1.1 date 2006.06.12.19.13.39; author MeredithLesly; state Exp; branches; next ; desc @none @ 1.11 log @none @ text @%META:TOPICINFO{author="LJDavidsonAdmin" date="1152056748" format="1.1" reprev="1.11" version="1.11"}% ---+ Welcome to the homepage of !! %FORMFIELD{"FirstName" topic="%USERSWEB%.%BASEWEB%"}% %FORMFIELD{"LastName" topic="%USERSWEB%.%BASEWEB%"}% ---++ My courses %INCLUDE{"Lib.JuniorCourses"}% ---++ My teachers %INCLUDE{"Lib.JuniorTeachers"}% ---++ My links * [[http://www.crimsonsummer.harvard.edu/learners.html][CSA webpage]] %META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25USERSWEB%25.ElizabethAsefa"}% %META:PREFERENCE{name="GRADE" title="GRADE" type="Set" value="Sophomore"}% @ 1.10 log @none @ text @d1 2 a2 2 %META:TOPICINFO{author="MeredithLesly" date="1151626102" format="1.1" version="1.10"}% ---+ Welcome to the page of !! %FORMFIELD{"FirstName" topic="%USERSWEB%.%BASEWEB%"}% %FORMFIELD{"LastName" topic="%USERSWEB%.%BASEWEB%"}% a3 1 %TOC% d7 1 a7 1 %INCLUDE{"Lib.%GRADE%Courses"}% d9 1 a9 1 ---+++ My teachers d11 1 a11 1 %INCLUDE{"Lib.%GRADE%Teachers"}% d14 4 @ 1.9 log @none @ text @d1 1 a1 1 %META:TOPICINFO{author="MeredithLesly" date="1151605615" format="1.1" version="1.9"}% a9 6 [[DoAnAssignment][Do an assignment...]] ---++ My assignments %INCLUDE{"Lib.%GRADE%AssignmentLinks"}% @ 1.8 log @none @ text @d1 1 a1 1 %META:TOPICINFO{author="MeredithLesly" date="1151603610" format="1.1" reprev="1.8" version="1.8"}% d23 1 @ 1.7 log @none @ text @d1 1 a1 1 %META:TOPICINFO{author="AdaLio" date="1151422898" format="1.1" version="1.7"}% d6 1 a6 1 ---++ My courses (KAMIL WAS HERE) a9 1
CONFLICT original 5:
a10 5
CONFLICT version 6:
*Here's where I can [[DoAnAssignment][Do an assignment...]].* It might be that http://www.google.com will help.
CONFLICT version new:
[[DoAnAssignment][Do an assignment...]]. "
CONFLICT end
d12 1 a12 1 ---++ My assignments =P a20 8 hey! -- Users.AdaLio - 27 Jun 2006 - 11:25 %COMMENT% d22 1 @ 1.6 log @none @ text @d1 2 a2 2 %META:TOPICINFO{author="LarryDavidson" date="1151420753" format="1.1" version="1.6"}% ---+!! %FORMFIELD{"FirstName" topic="%USERSWEB%.%BASEWEB%"}% %FORMFIELD{"LastName" topic="%USERSWEB%.%BASEWEB%"}% d10 3 d14 3 d18 1 a18 1 ---++ My assignments d24 12 a35 1 %INCLUDE{"Lib.%GRADE%Teachers"}%@ 1.5 log @none @ text @d1 1 a1 1 %META:TOPICINFO{author="KamilSupronik" date="1151420412" format="1.1" version="1.5"}% d10 1 a10 1 [[DoAnAssignment][Do an assignment...]] d16 1 a16 1 ---++ My teachers @ 1.4 log @none @ text @d1 1 a1 1 %META:TOPICINFO{author="MeredithLesly" date="1151401813" format="1.1" version="1.4"}% d6 1 a6 1 ---++ My courses @ 1.3 log @none @ text @d1 1 a1 1 %META:TOPICINFO{author="LJDavidsonAdmin" date="1150489930" format="1.1" version="1.3"}% d10 2 d18 1 a18 2 %INCLUDE{"Lib.%GRADE%Teachers"}% @ 1.2 log @none @ text @d1 1 a1 1 %META:TOPICINFO{author="MeredithLesly" date="1150396536" format="1.1" version="1.2"}% d6 1 a6 1 ---++ Your courses d10 1 a10 1 ---++ Your assignments d14 1 a14 1 ---++ Your teachers @ 1.1 log @none @ text @d1 4 a4 2 %META:TOPICINFO{author="MeredithLesly" date="1150139619" format="1.1" version="1.2"}% ---+!! %WEB% d9 9 @