Fixed some merge conflicts in the config.html files

Browse Source

...

This commit is contained in:

rembo10

2012-03-22 15:07:18 +00:00

parent 261bae36fa 6f2c1ea997

commit d382187e36

58 changed files with 16472 additions and 171 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

data/interfaces/remix/base.html

Executable → Regular

data/interfaces/remix/style.css

Executable → Regular