Fixed merge conflicts

Browse Source

Conflicts:

	src/themes/dark/main.css
	src/themes/default/main.css

...

This commit is contained in:

Andre Lorbach 2008-05-05 14:52:12 +02:00

parent f1f4f9da20 823443debe

commit 146bd75a09

4 changed files with 429 additions and 429 deletions

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

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