Fixed merge conflicts

Browse Source

Conflicts:

	src/templates/details.html
	src/templates/include_footer.html
	src/templates/index.html
	src/templates/install.html
	src/templates/search.html

...

This commit is contained in:

Andre Lorbach 2008-05-05 14:49:44 +02:00

parent 368b032351 08e98b9ea1

commit f1f4f9da20

7 changed files with 1063 additions and 1063 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