Changeset 3959


Ignore:
Timestamp:
2003-03-24T14:38:37+12:00 (21 years ago)
Author:
jrm21
Message:

tidy up Dana's conflict from usability stuff :)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/macros/base.dm

    r3906 r3959  
    765765_imagepref2_ {_gsimage_(_httppagepref_,_httpiconcprefof_,_httpiconcprefon_,pref,_textimagepref_)}
    766766
    767 <<<<<<< base.dm
    768767_imageusab_ {_gsimage_(_httppageusab_,_httpiconcusabof_,_httpiconcusabon_,usab,_textimageusab_)}
    769768
    770 
    771 _imagegreenstone_ {<img src="_httpicongsdl_" width="_widthgsdl_" height="_heightgsdl_" border="0" alt="_textimagegreenstone_" hspace=0>}
    772 =======
    773769_imagegreenstone_ {<img src="_httpicongsdl_" width="_widthgsdl_" height="_heightgsdl_" border="0" alt="_textimagegreenstone_" title="_textimagegreenstone_" hspace=0>}
    774 >>>>>>> 1.79
     770
    775771_imagegreenstone_[v=1] {_textimagegreenstone_}
    776 
    777 
    778 
    779 
    780 
    781 
    782 
    783 
    784 
    785 
    786 
    787 
    788 
    789 
    790 
    791 
    792 
Note: See TracChangeset for help on using the changeset viewer.