diff options
| author | Nicole Vreden <damba@slartibartfast.traut> | 2010-02-19 20:18:08 +0100 |
|---|---|---|
| committer | Nicole Vreden <damba@slartibartfast.traut> | 2010-02-19 20:18:08 +0100 |
| commit | 47398dbe18e7adb6b6a1493f18fc98247450e798 (patch) | |
| tree | 2a7e26068ce52706055e3eeb9a945af37d88ef34 /ServerSettings.xml | |
| parent | 998d09ecda2e86310331a984f8f760de9ef04e50 (diff) | |
| parent | ed22fce7a9f4332037bf0e9fd97a96b1876acba8 (diff) | |
Merge remote branch 'origin/damba' into damba
Diffstat (limited to 'ServerSettings.xml')
| -rw-r--r-- | ServerSettings.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ServerSettings.xml b/ServerSettings.xml index 4343a72..11dd45d 100644 --- a/ServerSettings.xml +++ b/ServerSettings.xml @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java version="1.6.0_17" class="java.beans.XMLDecoder"> - <string>jdbc:postgresql://localhost:5432/yalp</string> - <string>huhu</string> - <string>yalp</string> -</java> +<?xml version="1.0" encoding="UTF-8"?> +<java version="1.6.0_0" class="java.beans.XMLDecoder"> + <string>jdbc:postgresql://localhost:5432/yalp</string> + <string>huhu</string> + <string>yalp</string> +</java> |