Ignore:
Timestamp:
Nov 24, 2008, 11:36:13 PM (16 years ago)
Author:
andersk
Message:

Clean up stray conflict markers.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/xvm-prodconfig/debian/changelog

    r1760 r1766  
    11xvm-prodconfig (1.1.0) unstable; urgency=low
    22
    3     * Add a specification for a monitoring host (in our case, syn)
     3  * Add a specification for a monitoring host (in our case, syn)
    44
    55 -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:51:35 -0500
    … …  
    2222
    2323 -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:13:33 -0500
    24 =======
    25  -- Evan Broder <broder@mit.edu>  Fri, 21 Nov 2008 22:48:21 -0500
    26 >>>>>>> Add a specification for a monitoring host (i.e. syn):packages/xvm-prodconfig/debian/changelog
    2724
    2825xvm-prodconfig (1.0.1) unstable; urgency=low
Note: See TracChangeset for help on using the changeset viewer.