Unmerged changes from Debian

Bug #9608 reported by Debian Bug Importer
6
Affects Status Importance Assigned to Milestone
shadow (Ubuntu)
Fix Released
Medium
Matt Zimmerman

Bug Description

The shadow package has been updated in Debian, and those changes
        need to be merged into Ubuntu. An automatic merge was
        attempted, but was not able to process all of the changes.

        The output from the automatic attempt can be found here:

        http://people.ubuntu.com/~scott/merge/review/shadow

        Some documentation about the output can be found here:

        http://people.ubuntu.com/~scott/merge/README

Revision history for this message
Matt Zimmerman (mdz) wrote :

shadow (1:4.0.3-30.2ubuntu2) hoary; urgency=low

  * Resolve merge conflicts

 -- Matt Zimmerman <email address hidden> Thu, 28 Oct 2004 17:28:41 -0700

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.