diff options
| author | Tannin <devnull@localhost> | 2013-03-22 18:57:45 +0100 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2013-03-22 18:57:45 +0100 |
| commit | ec0ea9df8dabe686d3256665c7ed638660309915 (patch) | |
| tree | 39ff86ad325494c3531c159990ee695e84bee469 /src/modinfo.cpp | |
| parent | 24cc3861912cc33235af587d4f4feb538c1054dc (diff) | |
| parent | 74c75e60d67b66a63225239c1f6b1403662857aa (diff) | |
Merge with default
Diffstat (limited to 'src/modinfo.cpp')
| -rw-r--r-- | src/modinfo.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modinfo.cpp b/src/modinfo.cpp index 28bdf789..31f0278c 100644 --- a/src/modinfo.cpp +++ b/src/modinfo.cpp @@ -726,6 +726,9 @@ ModInfoRegular::EConflictType ModInfoRegular::isConflicted() const overwritten = true; break; } + } else if (alternatives.size() == 1) { + // only alternative is data -> no conflict + regular = true; } } } |
