fix merge problem.

Browse Source

...

This commit is contained in:

Arne Fitzenreiter

2014-09-29 13:44:26 +02:00

parent 61466ab18d

commit 416bf5f3f9

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

config/rootfiles/core/82/filelists/iputils → config/rootfiles/oldcore/82/filelists/iputils

0

config/rootfiles/core/82/filelists/openssl-compat → config/rootfiles/oldcore/82/filelists/openssl-compat