summaryrefslogtreecommitdiff
path: root/NewMembers.mdwn
authorAndrew Greenberg <andrew@psas.pdx.edu>2005-12-14 07:37:09 (GMT)
committer Andrew Greenberg <andrew@psas.pdx.edu>2005-12-14 07:37:09 (GMT)
commit509c61bb9ee54a6c00f9c296d52abad4ff751490 (patch) (side-by-side diff)
tree94c40f8db51da5c8e0403155bfc24cd5913abcdb /NewMembers.mdwn
parent2c0476372d3f328b31cc129b387a98395efb7e8a (diff)
downloadwiki-509c61bb9ee54a6c00f9c296d52abad4ff751490.zip
wiki-509c61bb9ee54a6c00f9c296d52abad4ff751490.tar.gz
NewMembers
Diffstat (limited to 'NewMembers.mdwn') (more/less context) (ignore whitespace changes)
-rw-r--r--NewMembers.mdwn12
1 files changed, 11 insertions, 1 deletions
diff --git a/NewMembers.mdwn b/NewMembers.mdwn
index 2c7c8f6..a9f5946 100644
--- a/NewMembers.mdwn
+++ b/NewMembers.mdwn
@@ -83,4 +83,14 @@ That said, if you have a reason for monitoring the lists - such as you're workin
</tr>
</table>
-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 - 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''' ----