summaryrefslogtreecommitdiff
path: root/resources2.php
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2011-01-05 17:23:33 +0100
committerStefan Beller <stefanbeller@googlemail.com>2011-01-05 17:42:12 +0100
commit28f9091d1d8819808f145dbbb08cf95af8139d29 (patch)
tree28c1e37d6dc90e12c95209b73306602be814738e /resources2.php
parentdc7c0909908eea9428960a82e76815cf1912a5d9 (diff)
downloadserverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.gz
serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.bz2
serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.xz
serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.zip
repair the repo.
- removing the <<<<====>>>> unsolved merge conflicts - reset some files, which are using CRLF(windows style) line ending to LF only (unix style) - adding some comments to the csv files to not edit them manually but to use nice programs
Diffstat (limited to 'resources2.php')
0 files changed, 0 insertions, 0 deletions