summaryrefslogtreecommitdiff
path: root/NewMembers.mdwn
authorAndrew Greenberg <andrew@psas.pdx.edu>2005-12-14 07:37:34 (GMT)
committer Andrew Greenberg <andrew@psas.pdx.edu>2005-12-14 07:37:34 (GMT)
commit1bcd5a92d948945a1eef8f6f9ef04d13d346f170 (patch) (side-by-side diff)
tree3f25ccc538fd92890b1ed208e552e653e465ac26 /NewMembers.mdwn
parent509c61bb9ee54a6c00f9c296d52abad4ff751490 (diff)
downloadwiki-1bcd5a92d948945a1eef8f6f9ef04d13d346f170.zip
wiki-1bcd5a92d948945a1eef8f6f9ef04d13d346f170.tar.gz
NewMembers
Diffstat (limited to 'NewMembers.mdwn') (more/less context) (ignore whitespace changes)
-rw-r--r--NewMembers.mdwn12
1 files changed, 1 insertions, 11 deletions
diff --git a/NewMembers.mdwn b/NewMembers.mdwn
index a9f5946..08766df 100644
--- a/NewMembers.mdwn
+++ b/NewMembers.mdwn
@@ -83,14 +83,4 @@ That said, if you have a reason for monitoring the lists - such as you're workin
</tr>
</table>
-----
-
-/!\\ '''Edit conflict - other version:''' ---- 2. Get yourself registered to use our wiki, a web-collaboration tool which lets us edit the PSAS site on the fly with nothing but a browser. Do this by coming to one of our meetings, and see our [:MoinFormattingHelp wiki editing help] to get started.
-
-----
-
-/!\\ '''Edit conflict - your version:''' ---- 2. Get yourself registered to use our wiki, a web-collaboration tool which lets us edit the PSAS site on the fly with nothing but a browser. Do this by coming to one of our meetings, and see our [wiki:MoinFormattingHelp wiki editing help] to get started.
-
-----
-
-/!\\ '''End of edit conflict''' ----
+2. Get yourself registered to use our wiki, a web-collaboration tool which lets us edit the PSAS site on the fly with nothing but a browser. Do this by coming to one of our meetings, and see our [wiki:MoinFormattingHelp wiki editing help] to get started.