- Committer: Steve Langasek
- Date: 2010-09-10 11:49:34 UTC
- Revision ID: steve.langasek@canonical.com-20100910114934-wqwsrkabvu9gnqah
Fix a typo in debian/smb.conf introduced in a previous merge that causes
3-way-merge to fail gratuitously for anyone who has enabled the [homes]
share.
3-way-merge to fail gratuitously for anyone who has enabled the [homes]
share.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
bin
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
Debian
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
Example
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
LSB
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
Mandrake
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
RHEL
|
31 | 16 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
RHEL-CTDB
|
0.26.3 | 15 years ago | Bazaar Package Importer | Import upstream version 3.3.0 |
|
||
|
SGI
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
Solaris
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
SuSE
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
sysv
|
31 | 16 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
README |
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic | 1.3 KB |
|
|