mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-11-02 09:54:07 +00:00
60d3d00ae6
Imported using git-ubuntu import. Changelog parent: 57607833950dda2f4a479cf29bfa9073af615dfe New changelog entries: * Rename Ubuntu Netbook Remix to Ubuntu Netbook.
20 lines
515 B
Plaintext
20 lines
515 B
Plaintext
BZR conflict list format 1
|
|
path: debian/changelog
|
|
type: text conflict
|
|
file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
|
|
|
|
path: debian/changelog.BASE.moved
|
|
type: duplicate
|
|
action: Moved existing file to
|
|
conflict_path: debian/changelog.BASE
|
|
|
|
path: debian/changelog.OTHER.moved
|
|
type: duplicate
|
|
action: Moved existing file to
|
|
conflict_path: debian/changelog.OTHER
|
|
|
|
path: debian/changelog.THIS.moved
|
|
type: duplicate
|
|
action: Moved existing file to
|
|
conflict_path: debian/changelog.THIS
|