Changeset 2614


Ignore:
Timestamp:
Nov 5, 2011, 1:00:47 AM (11 years ago)
Author:
Peter
Message:

remove stray conflict garbage from previous merge

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/m4/version.m4

    r2601 r2614  
    7272# *Accidently, the libtool number was not updated for yat 0.5
    7373#
    74 <<<<<<< .working
    7574m4_define([YAT_LT_VERSION_INFO], [5:0:0])
    76 =======
    77 m4_define([YAT_LT_VERSION_INFO], [4:3:0])
    78 >>>>>>> .merge-right.r2600
    7975
    8076###
Note: See TracChangeset for help on using the changeset viewer.