diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2011-01-05 17:23:33 +0100 |
|---|---|---|
| committer | Stefan Beller <stefanbeller@googlemail.com> | 2011-01-05 17:42:12 +0100 |
| commit | 28f9091d1d8819808f145dbbb08cf95af8139d29 (patch) | |
| tree | 28c1e37d6dc90e12c95209b73306602be814738e /data/resnametable.txt | |
| parent | dc7c0909908eea9428960a82e76815cf1912a5d9 (diff) | |
| download | serverdata-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 'data/resnametable.txt')
| -rw-r--r-- | data/resnametable.txt | 75 |
1 files changed, 3 insertions, 72 deletions
diff --git a/data/resnametable.txt b/data/resnametable.txt index 360606c6..fef4c32a 100644 --- a/data/resnametable.txt +++ b/data/resnametable.txt @@ -1,73 +1,3 @@ -<<<<<<< HEAD -001-1.gat#001-1.wlk#
-001-2.gat#001-2.wlk#
-001-3.gat#001-3.wlk#
-001-4.gat#001-4.wlk#
-002-1.gat#002-1.wlk#
-002-2.gat#002-2.wlk#
-002-3.gat#002-3.wlk#
-002-4.gat#002-4.wlk#
-003-1.gat#003-1.wlk#
-003-2.gat#003-2.wlk#
-004-1.gat#004-1.wlk#
-004-2.gat#004-2.wlk#
-005-1.gat#005-1.wlk#
-005-3.gat#005-3.wlk#
-006-1.gat#006-1.wlk#
-006-3.gat#006-3.wlk#
-007-1.gat#007-1.wlk#
-008-1.gat#008-1.wlk#
-009-1.gat#009-1.wlk#
-009-2.gat#009-2.wlk#
-009-3.gat#009-3.wlk#
-010-1.gat#010-1.wlk#
-010-2.gat#010-2.wlk#
-011-1.gat#011-1.wlk#
-011-3.gat#011-3.wlk#
-011-4.gat#011-4.wlk#
-011-5.gat#011-5.wlk#
-012-1.gat#012-1.wlk#
-012-3.gat#012-3.wlk#
-012-4.gat#012-4.wlk#
-013-1.gat#013-1.wlk#
-013-2.gat#013-2.wlk#
-013-3.gat#013-3.wlk#
-014-1.gat#014-1.wlk#
-014-3.gat#014-3.wlk#
-015-1.gat#015-1.wlk#
-015-3.gat#015-3.wlk#
-016-1.gat#016-1.wlk#
-017-1.gat#017-1.wlk#
-017-2.gat#017-2.wlk#
-017-9.gat#017-9.wlk#
-018-1.gat#018-1.wlk#
-018-2.gat#018-2.wlk#
-018-3.gat#018-3.wlk#
-019-1.gat#019-1.wlk#
-020-1.gat#020-1.wlk#
-020-2.gat#020-2.wlk#
-020-3.gat#020-3.wlk#
-020-4.gat#020-4.wlk#
-021-1.gat#021-1.wlk#
-021-2.gat#021-2.wlk#
-021-8.gat#021-8.wlk#
-022-1.gat#022-1.wlk#
-023-1.gat#023-1.wlk#
-024-1.gat#024-1.wlk#
-024-2.gat#024-2.wlk#
-025-1.gat#025-1.wlk#
-026-1.gat#026-1.wlk#
-027-1.gat#027-1.wlk#
-027-2.gat#027-2.wlk#
-027-3.gat#027-3.wlk#
-027-4.gat#027-4.wlk#
-028-1.gat#028-1.wlk#
-028-3.gat#028-3.wlk#
-029-1.gat#029-1.wlk#
-029-3.gat#029-3.wlk#
-botcheck.gat#botcheck.wlk#
-debugroom.gat#debugroom.wlk#
-======= 001-1.gat#001-1.wlk# 001-2.gat#001-2.wlk# 001-3.gat#001-3.wlk# @@ -130,6 +60,8 @@ debugroom.gat#debugroom.wlk# 026-1.gat#026-1.wlk# 027-1.gat#027-1.wlk# 027-2.gat#027-2.wlk# +027-3.gat#027-3.wlk# +027-4.gat#027-4.wlk# 028-1.gat#028-1.wlk# 028-3.gat#028-3.wlk# 029-1.gat#029-1.wlk# @@ -140,6 +72,5 @@ debugroom.gat#debugroom.wlk# 031-3.gat#031-3.wlk# 032-1.gat#032-1.wlk# 032-3.gat#032-3.wlk# - botcheck.gat#botcheck.wlk# ->>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b +debugroom.gat#debugroom.wlk# |