Author: mmazur   Date: Fri Aug 12 19:26:46 2005 GMT
Module: PLDWWW   URL: http://www.pld-linux.org/mmazur
---- Log message:
test

---- Page affected: mmazur

---- Diffs:

================================================================
  
  
  ---- /!\ '''Edit conflict - other version:''' ----
+ 
+ ---- /!\ '''Edit conflict - other version:''' ----
  ---- /!\ '''End of edit conflict''' ----asdfasdfasdfasdf
  
  
  ---- /!\ '''Edit conflict - your version:''' ----
  ---- /!\ '''End of edit conflict''' ----asdfasdfasdfasdf
  asdfasdfasdf
+ 
+ ---- /!\ '''End of edit conflict''' ----
+ 
+ ---- /!\ '''Edit conflict - your version:''' ----
+ 
+ ---- /!\ '''Edit conflict - other version:''' ----
+ ---- /!\ '''End of edit conflict''' ----asdfasdfasdfasdf
+ 
+ 
+ ---- /!\ '''Edit conflict - your version:''' ----
+ ---- /!\ '''End of edit conflict''' ----asdfasdfasdfasdf
+ asdfasdfasdf
+ 
+ ---- /!\ '''End of edit conflict''' ----
  
  ---- /!\ '''End of edit conflict''' ----
  ---- /!\ '''Edit conflict - your version:''' ----
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to