diff options
| author | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-30 19:20:54 +0100 |
|---|---|---|
| committer | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-30 19:20:54 +0100 |
| commit | a02ae21955b5fbc6e1922debb514392739790628 (patch) | |
| tree | 3090475c0ec91d98ab6ec9b03e72eacce511c3d4 /ServerSettings.xml | |
| parent | 97ecea2efaff1daa73492ecbc56835f985be62f3 (diff) | |
| parent | 662d4edc187427bbabb75bad3daa3a02007f783c (diff) | |
Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba
Conflicts:
src/YalpClients/EflClient/list_test.edc
src/YalpClients/EflClient/list_test_elem.py
Signed-off-by: Nicole Vreden <damba@slartibartfast.traut>
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 11dd45d..4343a72 100644 --- a/ServerSettings.xml +++ b/ServerSettings.xml @@ -1,6 +1,6 @@ -<?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> +<?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> |