fixed strange results of merge

e6faa9c6 · Alexandra Panyukova · 1067e126 · 1067e126 · e6faa9c6 · 1067e126
Commit e6faa9c6 authored Apr 16, 2009 by Alexandra Panyukova
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

background.png images/background.png +0 -0

boot.jpg images/boot.jpg +0 -0

No files found.
--- a/images/background.png
+++ b/images/background.png
--- a/images/boot.jpg
+++ b/images/boot.jpg