API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 14th, 2017
120
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 279.27 KB | None | 0 0
raw download clone embed print report
  1. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/plugin/desktop/sun_java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/plugin/desktop/sun_java.png" in branch "HEAD" rename "GeoSwitchover/template/java/plugin/desktop/sun_java.png"->"GeoSwitchover/old/template/java/plugin/desktop/sun_java.png" in "GeoSwitchover-devel"
  2. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/plugin/desktop/sun_java.desktop"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/plugin/desktop/sun_java.desktop" in branch "HEAD" rename "GeoSwitchover/template/java/plugin/desktop/sun_java.desktop"->"GeoSwitchover/old/template/java/plugin/desktop/sun_java.desktop" in "GeoSwitchover-devel"
  3. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/sound.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/sound.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/sound.properties"->"GeoSwitchover/old/template/java/lib/sound.properties" in "GeoSwitchover-devel"
  4. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/security/javaws.policy"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/security/javaws.policy" in branch "HEAD" rename "GeoSwitchover/template/java/lib/security/javaws.policy"->"GeoSwitchover/old/template/java/lib/security/javaws.policy" in "GeoSwitchover-devel"
  5. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/security/java.security"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/security/java.security" in branch "HEAD" rename "GeoSwitchover/template/java/lib/security/java.security"->"GeoSwitchover/old/template/java/lib/security/java.security" in "GeoSwitchover-devel"
  6. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/security/cacerts"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/security/cacerts" in branch "HEAD" rename "GeoSwitchover/template/java/lib/security/cacerts"->"GeoSwitchover/old/template/java/lib/security/cacerts" in "GeoSwitchover-devel"
  7. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/rt.jar"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/rt.jar" in branch "HEAD" rename "GeoSwitchover/template/java/lib/rt.jar"->"GeoSwitchover/old/template/java/lib/rt.jar" in "GeoSwitchover-devel"
  8. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/resources.jar"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/resources.jar" in branch "HEAD" rename "GeoSwitchover/template/java/lib/resources.jar"->"GeoSwitchover/old/template/java/lib/resources.jar" in "GeoSwitchover-devel"
  9. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/psfontj2d.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/psfontj2d.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/psfontj2d.properties"->"GeoSwitchover/old/template/java/lib/psfontj2d.properties" in "GeoSwitchover-devel"
  10. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/psfont.properties.ja"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/psfont.properties.ja" in branch "HEAD" rename "GeoSwitchover/template/java/lib/psfont.properties.ja"->"GeoSwitchover/old/template/java/lib/psfont.properties.ja" in "GeoSwitchover-devel"
  11. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/oblique-fonts/fonts.dir"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/oblique-fonts/fonts.dir" in branch "HEAD" rename "GeoSwitchover/template/java/lib/oblique-fonts/fonts.dir"->"GeoSwitchover/old/template/java/lib/oblique-fonts/fonts.dir" in "GeoSwitchover-devel"
  12. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/oblique-fonts/LucidaTypewriterOblique.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/oblique-fonts/LucidaTypewriterOblique.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/oblique-fonts/LucidaTypewriterOblique.ttf"->"GeoSwitchover/old/template/java/lib/oblique-fonts/LucidaTypewriterOblique.ttf" in "GeoSwitchover-devel"
  13. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf"->"GeoSwitchover/old/template/java/lib/oblique-fonts/LucidaTypewriterBoldOblique.ttf" in "GeoSwitchover-devel"
  14. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/oblique-fonts/LucidaSansOblique.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/oblique-fonts/LucidaSansOblique.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/oblique-fonts/LucidaSansOblique.ttf"->"GeoSwitchover/old/template/java/lib/oblique-fonts/LucidaSansOblique.ttf" in "GeoSwitchover-devel"
  15. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/oblique-fonts/LucidaSansDemiOblique.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/oblique-fonts/LucidaSansDemiOblique.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/oblique-fonts/LucidaSansDemiOblique.ttf"->"GeoSwitchover/old/template/java/lib/oblique-fonts/LucidaSansDemiOblique.ttf" in "GeoSwitchover-devel"
  16. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/net.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/net.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/net.properties"->"GeoSwitchover/old/template/java/lib/net.properties" in "GeoSwitchover-devel"
  17. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/meta-index"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/meta-index" in branch "HEAD" rename "GeoSwitchover/template/java/lib/meta-index"->"GeoSwitchover/old/template/java/lib/meta-index" in "GeoSwitchover-devel"
  18. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/management/snmp.acl.template"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/management/snmp.acl.template" in branch "HEAD" rename "GeoSwitchover/template/java/lib/management/snmp.acl.template"->"GeoSwitchover/old/template/java/lib/management/snmp.acl.template" in "GeoSwitchover-devel"
  19. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/management/management.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/management/management.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/management/management.properties"->"GeoSwitchover/old/template/java/lib/management/management.properties" in "GeoSwitchover-devel"
  20. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/management/jmxremote.password.template"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/management/jmxremote.password.template" in branch "HEAD" rename "GeoSwitchover/template/java/lib/management/jmxremote.password.template"->"GeoSwitchover/old/template/java/lib/management/jmxremote.password.template" in "GeoSwitchover-devel"
  21. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/management/jmxremote.access"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/management/jmxremote.access" in branch "HEAD" rename "GeoSwitchover/template/java/lib/management/jmxremote.access"->"GeoSwitchover/old/template/java/lib/management/jmxremote.access" in "GeoSwitchover-devel"
  22. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/logging.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/logging.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/logging.properties"->"GeoSwitchover/old/template/java/lib/logging.properties" in "GeoSwitchover-devel"
  23. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  24. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  25. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/zh_HK.BIG5HK/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  26. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  27. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  28. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  29. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/pt_BR/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/pt_BR/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/pt_BR/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/pt_BR/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  30. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  31. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  32. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  33. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  34. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  35. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  36. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo" in branch "HEAD" rename "GeoSwitchover/template/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo"->"GeoSwitchover/old/template/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo" in "GeoSwitchover-devel"
  37. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/jvm.hprof.txt"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/jvm.hprof.txt" in branch "HEAD" rename "GeoSwitchover/template/java/lib/jvm.hprof.txt"->"GeoSwitchover/old/template/java/lib/jvm.hprof.txt" in "GeoSwitchover-devel"
  38. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/icons/sun-java_LowContrast.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/icons/sun-java_LowContrast.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/icons/sun-java_LowContrast.png"->"GeoSwitchover/old/template/java/lib/images/icons/sun-java_LowContrast.png" in "GeoSwitchover-devel"
  39. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/icons/sun-java_HighContrastInverse.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/icons/sun-java_HighContrastInverse.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/icons/sun-java_HighContrastInverse.png"->"GeoSwitchover/old/template/java/lib/images/icons/sun-java_HighContrastInverse.png" in "GeoSwitchover-devel"
  40. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/icons/sun-java_HighContrast.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/icons/sun-java_HighContrast.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/icons/sun-java_HighContrast.png"->"GeoSwitchover/old/template/java/lib/images/icons/sun-java_HighContrast.png" in "GeoSwitchover-devel"
  41. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/icons/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/icons/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/icons/sun-java.png"->"GeoSwitchover/old/template/java/lib/images/icons/sun-java.png" in "GeoSwitchover-devel"
  42. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/cursors/motif_MoveNoDrop32x32.gif"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/cursors/motif_MoveNoDrop32x32.gif" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/cursors/motif_MoveNoDrop32x32.gif"->"GeoSwitchover/old/template/java/lib/images/cursors/motif_MoveNoDrop32x32.gif" in "GeoSwitchover-devel"
  43. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/cursors/motif_MoveDrop32x32.gif"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/cursors/motif_MoveDrop32x32.gif" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/cursors/motif_MoveDrop32x32.gif"->"GeoSwitchover/old/template/java/lib/images/cursors/motif_MoveDrop32x32.gif" in "GeoSwitchover-devel"
  44. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/cursors/motif_LinkNoDrop32x32.gif"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/cursors/motif_LinkNoDrop32x32.gif" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/cursors/motif_LinkNoDrop32x32.gif"->"GeoSwitchover/old/template/java/lib/images/cursors/motif_LinkNoDrop32x32.gif" in "GeoSwitchover-devel"
  45. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/cursors/motif_LinkDrop32x32.gif"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/cursors/motif_LinkDrop32x32.gif" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/cursors/motif_LinkDrop32x32.gif"->"GeoSwitchover/old/template/java/lib/images/cursors/motif_LinkDrop32x32.gif" in "GeoSwitchover-devel"
  46. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/cursors/motif_CopyNoDrop32x32.gif"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/cursors/motif_CopyNoDrop32x32.gif" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/cursors/motif_CopyNoDrop32x32.gif"->"GeoSwitchover/old/template/java/lib/images/cursors/motif_CopyNoDrop32x32.gif" in "GeoSwitchover-devel"
  47. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/cursors/motif_CopyDrop32x32.gif"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/cursors/motif_CopyDrop32x32.gif" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/cursors/motif_CopyDrop32x32.gif"->"GeoSwitchover/old/template/java/lib/images/cursors/motif_CopyDrop32x32.gif" in "GeoSwitchover-devel"
  48. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/cursors/invalid32x32.gif"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/cursors/invalid32x32.gif" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/cursors/invalid32x32.gif"->"GeoSwitchover/old/template/java/lib/images/cursors/invalid32x32.gif" in "GeoSwitchover-devel"
  49. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/images/cursors/cursors.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/images/cursors/cursors.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/images/cursors/cursors.properties"->"GeoSwitchover/old/template/java/lib/images/cursors/cursors.properties" in "GeoSwitchover-devel"
  50. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/fonts.dir"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/fonts.dir" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/fonts.dir"->"GeoSwitchover/old/template/java/lib/fonts/fonts.dir" in "GeoSwitchover-devel"
  51. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/LucidaTypewriterRegular.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/LucidaTypewriterRegular.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/LucidaTypewriterRegular.ttf"->"GeoSwitchover/old/template/java/lib/fonts/LucidaTypewriterRegular.ttf" in "GeoSwitchover-devel"
  52. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/LucidaTypewriterBold.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/LucidaTypewriterBold.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/LucidaTypewriterBold.ttf"->"GeoSwitchover/old/template/java/lib/fonts/LucidaTypewriterBold.ttf" in "GeoSwitchover-devel"
  53. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/LucidaSansRegular.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/LucidaSansRegular.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/LucidaSansRegular.ttf"->"GeoSwitchover/old/template/java/lib/fonts/LucidaSansRegular.ttf" in "GeoSwitchover-devel"
  54. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/LucidaSansDemiBold.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/LucidaSansDemiBold.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/LucidaSansDemiBold.ttf"->"GeoSwitchover/old/template/java/lib/fonts/LucidaSansDemiBold.ttf" in "GeoSwitchover-devel"
  55. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/LucidaBrightRegular.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/LucidaBrightRegular.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/LucidaBrightRegular.ttf"->"GeoSwitchover/old/template/java/lib/fonts/LucidaBrightRegular.ttf" in "GeoSwitchover-devel"
  56. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/LucidaBrightItalic.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/LucidaBrightItalic.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/LucidaBrightItalic.ttf"->"GeoSwitchover/old/template/java/lib/fonts/LucidaBrightItalic.ttf" in "GeoSwitchover-devel"
  57. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/LucidaBrightDemiItalic.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/LucidaBrightDemiItalic.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/LucidaBrightDemiItalic.ttf"->"GeoSwitchover/old/template/java/lib/fonts/LucidaBrightDemiItalic.ttf" in "GeoSwitchover-devel"
  58. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fonts/LucidaBrightDemiBold.ttf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fonts/LucidaBrightDemiBold.ttf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fonts/LucidaBrightDemiBold.ttf"->"GeoSwitchover/old/template/java/lib/fonts/LucidaBrightDemiBold.ttf" in "GeoSwitchover-devel"
  59. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.properties.src"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.properties.src" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.properties.src"->"GeoSwitchover/old/template/java/lib/fontconfig.properties.src" in "GeoSwitchover-devel"
  60. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.Turbo.properties.src"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.Turbo.properties.src" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.Turbo.properties.src"->"GeoSwitchover/old/template/java/lib/fontconfig.Turbo.properties.src" in "GeoSwitchover-devel"
  61. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.Turbo.bfc"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.Turbo.bfc" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.Turbo.bfc"->"GeoSwitchover/old/template/java/lib/fontconfig.Turbo.bfc" in "GeoSwitchover-devel"
  62. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.SuSE.11.properties.src"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.SuSE.11.properties.src" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.SuSE.11.properties.src"->"GeoSwitchover/old/template/java/lib/fontconfig.SuSE.11.properties.src" in "GeoSwitchover-devel"
  63. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.SuSE.11.bfc"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.SuSE.11.bfc" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.SuSE.11.bfc"->"GeoSwitchover/old/template/java/lib/fontconfig.SuSE.11.bfc" in "GeoSwitchover-devel"
  64. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.SuSE.10.properties.src"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.SuSE.10.properties.src" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.SuSE.10.properties.src"->"GeoSwitchover/old/template/java/lib/fontconfig.SuSE.10.properties.src" in "GeoSwitchover-devel"
  65. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.SuSE.10.bfc"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.SuSE.10.bfc" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.SuSE.10.bfc"->"GeoSwitchover/old/template/java/lib/fontconfig.SuSE.10.bfc" in "GeoSwitchover-devel"
  66. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.RedHat.5.5.properties.src"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.RedHat.5.properties.src" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.RedHat.5.5.properties.src"->"GeoSwitchover/old/template/java/lib/fontconfig.RedHat.5.5.properties.src" in "GeoSwitchover-devel"
  67. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/fontconfig.RedHat.5.5.bfc"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/fontconfig.RedHat.5.bfc" in branch "HEAD" rename "GeoSwitchover/template/java/lib/fontconfig.RedHat.5.5.bfc"->"GeoSwitchover/old/template/java/lib/fontconfig.RedHat.5.5.bfc" in "GeoSwitchover-devel"
  68. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/flavormap.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/flavormap.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/flavormap.properties"->"GeoSwitchover/old/template/java/lib/flavormap.properties" in "GeoSwitchover-devel"
  69. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/mime/packages/x-java-jnlp-file.xml"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/mime/packages/x-java-jnlp-file.xml" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/mime/packages/x-java-jnlp-file.xml"->"GeoSwitchover/old/template/java/lib/desktop/mime/packages/x-java-jnlp-file.xml" in "GeoSwitchover-devel"
  70. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/mime/packages/x-java-archive.xml"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/mime/packages/x-java-archive.xml" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/mime/packages/x-java-archive.xml"->"GeoSwitchover/old/template/java/lib/desktop/mime/packages/x-java-archive.xml" in "GeoSwitchover-devel"
  71. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png" in "GeoSwitchover-devel"
  72. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in "GeoSwitchover-devel"
  73. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-archive.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-archive.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-archive.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-java-archive.png" in "GeoSwitchover-devel"
  74. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png" in "GeoSwitchover-devel"
  75. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-javaws.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/48x48/apps/sun-javaws.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-javaws.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-javaws.png" in "GeoSwitchover-devel"
  76. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/48x48/apps/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/48x48/apps/sun-java.png" in "GeoSwitchover-devel"
  77. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png" in "GeoSwitchover-devel"
  78. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in "GeoSwitchover-devel"
  79. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-archive.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-archive.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-archive.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/16x16/mimetypes/gnome-mime-application-x-java-archive.png" in "GeoSwitchover-devel"
  80. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-jcontrol.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/16x16/apps/sun-jcontrol.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-jcontrol.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-jcontrol.png" in "GeoSwitchover-devel"
  81. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-javaws.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/16x16/apps/sun-javaws.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-javaws.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-javaws.png" in "GeoSwitchover-devel"
  82. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/hicolor/16x16/apps/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/hicolor/16x16/apps/sun-java.png" in "GeoSwitchover-devel"
  83. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-text-x-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-text-x-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-text-x-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-text-x-java.png" in "GeoSwitchover-devel"
  84. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in "GeoSwitchover-devel"
  85. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png" in "GeoSwitchover-devel"
  86. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-jcontrol.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/48x48/apps/sun-jcontrol.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-jcontrol.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-jcontrol.png" in "GeoSwitchover-devel"
  87. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-javaws.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/48x48/apps/sun-javaws.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-javaws.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-javaws.png" in "GeoSwitchover-devel"
  88. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/48x48/apps/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/48x48/apps/sun-java.png" in "GeoSwitchover-devel"
  89. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-text-x-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-text-x-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-text-x-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-text-x-java.png" in "GeoSwitchover-devel"
  90. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in "GeoSwitchover-devel"
  91. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png" in "GeoSwitchover-devel"
  92. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-jcontrol.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/16x16/apps/sun-jcontrol.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-jcontrol.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-jcontrol.png" in "GeoSwitchover-devel"
  93. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-javaws.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/16x16/apps/sun-javaws.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-javaws.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-javaws.png" in "GeoSwitchover-devel"
  94. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/LowContrast/16x16/apps/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/LowContrast/16x16/apps/sun-java.png" in "GeoSwitchover-devel"
  95. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-text-x-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-text-x-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-text-x-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-text-x-java.png" in "GeoSwitchover-devel"
  96. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in "GeoSwitchover-devel"
  97. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-archive.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-archive.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-archive.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/48x48/mimetypes/gnome-mime-application-x-java-archive.png" in "GeoSwitchover-devel"
  98. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-jcontrol.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-jcontrol.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-jcontrol.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-jcontrol.png" in "GeoSwitchover-devel"
  99. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-javaws.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-javaws.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-javaws.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-javaws.png" in "GeoSwitchover-devel"
  100. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/48x48/apps/sun-java.png" in "GeoSwitchover-devel"
  101. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-text-x-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-text-x-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-text-x-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-text-x-java.png" in "GeoSwitchover-devel"
  102. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in "GeoSwitchover-devel"
  103. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-archive.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-archive.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-archive.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/16x16/mimetypes/gnome-mime-application-x-java-archive.png" in "GeoSwitchover-devel"
  104. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-jcontrol.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-jcontrol.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-jcontrol.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-jcontrol.png" in "GeoSwitchover-devel"
  105. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-javaws.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-javaws.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-javaws.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-javaws.png" in "GeoSwitchover-devel"
  106. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrastInverse/16x16/apps/sun-java.png" in "GeoSwitchover-devel"
  107. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-text-x-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-text-x-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-text-x-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-text-x-java.png" in "GeoSwitchover-devel"
  108. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in "GeoSwitchover-devel"
  109. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/48x48/mimetypes/gnome-mime-application-x-java-archive.png" in "GeoSwitchover-devel"
  110. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-jcontrol.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/48x48/apps/sun-jcontrol.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-jcontrol.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-jcontrol.png" in "GeoSwitchover-devel"
  111. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-javaws.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/48x48/apps/sun-javaws.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-javaws.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-javaws.png" in "GeoSwitchover-devel"
  112. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/48x48/apps/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/48x48/apps/sun-java.png" in "GeoSwitchover-devel"
  113. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-text-x-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-text-x-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-text-x-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-text-x-java.png" in "GeoSwitchover-devel"
  114. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-jnlp-file.png" in "GeoSwitchover-devel"
  115. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/16x16/mimetypes/gnome-mime-application-x-java-archive.png" in "GeoSwitchover-devel"
  116. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-jcontrol.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/16x16/apps/sun-jcontrol.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-jcontrol.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-jcontrol.png" in "GeoSwitchover-devel"
  117. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-javaws.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/16x16/apps/sun-javaws.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-javaws.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-javaws.png" in "GeoSwitchover-devel"
  118. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-java.png"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/icons/HighContrast/16x16/apps/sun-java.png" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-java.png"->"GeoSwitchover/old/template/java/lib/desktop/icons/HighContrast/16x16/apps/sun-java.png" in "GeoSwitchover-devel"
  119. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/applications/sun_java.desktop"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/applications/sun_java.desktop" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/applications/sun_java.desktop"->"GeoSwitchover/old/template/java/lib/desktop/applications/sun_java.desktop" in "GeoSwitchover-devel"
  120. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/applications/sun-javaws.desktop"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/applications/sun-javaws.desktop" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/applications/sun-javaws.desktop"->"GeoSwitchover/old/template/java/lib/desktop/applications/sun-javaws.desktop" in "GeoSwitchover-devel"
  121. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/desktop/applications/sun-java.desktop"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/desktop/applications/sun-java.desktop" in branch "HEAD" rename "GeoSwitchover/template/java/lib/desktop/applications/sun-java.desktop"->"GeoSwitchover/old/template/java/lib/desktop/applications/sun-java.desktop" in "GeoSwitchover-devel"
  122. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_zh_TW.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_zh_TW.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_zh_TW.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_zh_TW.properties" in "GeoSwitchover-devel"
  123. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_zh_HK.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_zh_HK.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_zh_HK.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_zh_HK.properties" in "GeoSwitchover-devel"
  124. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_zh_CN.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_zh_CN.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_zh_CN.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_zh_CN.properties" in "GeoSwitchover-devel"
  125. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_sv.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_sv.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_sv.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_sv.properties" in "GeoSwitchover-devel"
  126. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_pt_BR.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_pt_BR.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_pt_BR.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_pt_BR.properties" in "GeoSwitchover-devel"
  127. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_ko.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_ko.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_ko.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_ko.properties" in "GeoSwitchover-devel"
  128. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_ja.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_ja.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_ja.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_ja.properties" in "GeoSwitchover-devel"
  129. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_it.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_it.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_it.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_it.properties" in "GeoSwitchover-devel"
  130. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_fr.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_fr.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_fr.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_fr.properties" in "GeoSwitchover-devel"
  131. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_es.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_es.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_es.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_es.properties" in "GeoSwitchover-devel"
  132. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages_de.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages_de.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages_de.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages_de.properties" in "GeoSwitchover-devel"
  133. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/messages.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/messages.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/messages.properties"->"GeoSwitchover/old/template/java/lib/deploy/messages.properties" in "GeoSwitchover-devel"
  134. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/deploy/java-icon.ico"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/deploy/java-icon.ico" in branch "HEAD" rename "GeoSwitchover/template/java/lib/deploy/java-icon.ico"->"GeoSwitchover/old/template/java/lib/deploy/java-icon.ico" in "GeoSwitchover-devel"
  135. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/content-types.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/content-types.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/content-types.properties"->"GeoSwitchover/old/template/java/lib/content-types.properties" in "GeoSwitchover-devel"
  136. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/cmm/sRGB.pf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/cmm/sRGB.pf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/cmm/sRGB.pf"->"GeoSwitchover/old/template/java/lib/cmm/sRGB.pf" in "GeoSwitchover-devel"
  137. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/cmm/PYCC.pf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/cmm/PYCC.pf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/cmm/PYCC.pf"->"GeoSwitchover/old/template/java/lib/cmm/PYCC.pf" in "GeoSwitchover-devel"
  138. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/cmm/LINEAR_RGB.pf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/cmm/LINEAR_RGB.pf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/cmm/LINEAR_RGB.pf"->"GeoSwitchover/old/template/java/lib/cmm/LINEAR_RGB.pf" in "GeoSwitchover-devel"
  139. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/cmm/GRAY.pf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/cmm/GRAY.pf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/cmm/GRAY.pf"->"GeoSwitchover/old/template/java/lib/cmm/GRAY.pf" in "GeoSwitchover-devel"
  140. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/cmm/CIEXYZ.pf"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/cmm/CIEXYZ.pf" in branch "HEAD" rename "GeoSwitchover/template/java/lib/cmm/CIEXYZ.pf"->"GeoSwitchover/old/template/java/lib/cmm/CIEXYZ.pf" in "GeoSwitchover-devel"
  141. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/classlist"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/classlist" in branch "HEAD" rename "GeoSwitchover/template/java/lib/classlist"->"GeoSwitchover/old/template/java/lib/classlist" in "GeoSwitchover-devel"
  142. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/calendars.properties"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/calendars.properties" in branch "HEAD" rename "GeoSwitchover/template/java/lib/calendars.properties"->"GeoSwitchover/old/template/java/lib/calendars.properties" in "GeoSwitchover-devel"
  143. CONFLICT (rename/rename): Rename "GeoSwitchover/installer/reg-ep/DSImporter.jar"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/amd64/server/libjvm.so" in branch "HEAD" rename "GeoSwitchover/installer/reg-ep/DSImporter.jar"->"GeoSwitchover/old/installer/reg-ep/DSImporter.jar" in "GeoSwitchover-devel"
  144. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/amd64/server/Xusage.txt"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/amd64/server/Xusage.txt" in branch "HEAD" rename "GeoSwitchover/template/java/lib/amd64/server/Xusage.txt"->"GeoSwitchover/old/template/java/lib/amd64/server/Xusage.txt" in "GeoSwitchover-devel"
  145. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/amd64/libmlib_image.so"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/amd64/libmlib_image.so" in branch "HEAD" rename "GeoSwitchover/template/java/lib/amd64/libmlib_image.so"->"GeoSwitchover/old/template/java/lib/amd64/libmlib_image.so" in "GeoSwitchover-devel"
  146. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/amd64/libjsound.so"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/amd64/libjsound.so" in branch "HEAD" rename "GeoSwitchover/template/java/lib/amd64/libjsound.so"->"GeoSwitchover/old/template/java/lib/amd64/libjsound.so" in "GeoSwitchover-devel"
  147. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/amd64/libjsdt.so"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/amd64/libjsdt.so" in branch "HEAD" rename "GeoSwitchover/template/java/lib/amd64/libjsdt.so"->"GeoSwitchover/old/template/java/lib/amd64/libjsdt.so" in "GeoSwitchover-devel"
  148. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/amd64/libjpeg.so"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/amd64/libjpeg.so" in branch "HEAD" rename "GeoSwitchover/template/java/lib/amd64/libjpeg.so"->"GeoSwitchover/old/template/java/lib/amd64/libjpeg.so" in "GeoSwitchover-devel"
  149. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/lib/amd64/jvm.cfg"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/lib/amd64/jvm.cfg" in branch "HEAD" rename "GeoSwitchover/template/java/lib/amd64/jvm.cfg"->"GeoSwitchover/old/template/java/lib/amd64/jvm.cfg" in "GeoSwitchover-devel"
  150. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/bin/jcontrol"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/bin/jcontrol" in branch "HEAD" rename "GeoSwitchover/template/java/bin/jcontrol"->"GeoSwitchover/old/template/java/bin/jcontrol" in "GeoSwitchover-devel"
  151. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/bin/ControlPanel"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/bin/ControlPanel" in branch "HEAD" rename "GeoSwitchover/template/java/bin/ControlPanel"->"GeoSwitchover/old/template/java/bin/ControlPanel" in "GeoSwitchover-devel"
  152. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/Welcome.html"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/Welcome.html" in branch "HEAD" rename "GeoSwitchover/template/java/Welcome.html"->"GeoSwitchover/old/template/java/Welcome.html" in "GeoSwitchover-devel"
  153. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/THIRDPARTYLICENSEREADME.txt"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/THIRDPARTYLICENSEREADME.txt" in branch "HEAD" rename "GeoSwitchover/template/java/THIRDPARTYLICENSEREADME.txt"->"GeoSwitchover/old/template/java/THIRDPARTYLICENSEREADME.txt" in "GeoSwitchover-devel"
  154. CONFLICT (rename/rename): Rename "GeoSwitchover/template/java/LICENSE"->"tennetde-autodownload/Platform/opt/automatic_downloader/java/LICENSE" in branch "HEAD" rename "GeoSwitchover/template/java/LICENSE"->"GeoSwitchover/old/template/java/LICENSE" in "GeoSwitchover-devel"
  155. CONFLICT (rename/delete): GeoSwitchover/template/java/release deleted in HEAD and renamed to GeoSwitchover/old/template/java/release in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/release left in tree.
  156. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/unpack200.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/unpack200.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/unpack200.1 left in tree.
  157. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/tnameserv.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/tnameserv.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/tnameserv.1 left in tree.
  158. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/servertool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/servertool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/servertool.1 left in tree.
  159. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/rmiregistry.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/rmiregistry.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/rmiregistry.1 left in tree.
  160. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/rmid.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/rmid.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/rmid.1 left in tree.
  161. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/policytool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/policytool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/policytool.1 left in tree.
  162. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/pack200.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/pack200.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/pack200.1 left in tree.
  163. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/orbd.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/orbd.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/orbd.1 left in tree.
  164. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/keytool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/keytool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/keytool.1 left in tree.
  165. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/javaws.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/javaws.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/javaws.1 left in tree.
  166. CONFLICT (rename/delete): GeoSwitchover/template/java/man/man1/java.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/man1/java.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/man1/java.1 left in tree.
  167. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/unpack200.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/unpack200.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/unpack200.1 left in tree.
  168. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/tnameserv.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/tnameserv.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/tnameserv.1 left in tree.
  169. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/servertool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/servertool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/servertool.1 left in tree.
  170. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/rmiregistry.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/rmiregistry.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/rmiregistry.1 left in tree.
  171. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/rmid.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/rmid.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/rmid.1 left in tree.
  172. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/policytool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/policytool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/policytool.1 left in tree.
  173. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/pack200.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/pack200.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/pack200.1 left in tree.
  174. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/orbd.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/orbd.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/orbd.1 left in tree.
  175. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/keytool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/keytool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/keytool.1 left in tree.
  176. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/javaws.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/javaws.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/javaws.1 left in tree.
  177. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja_JP.UTF-8/man1/java.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/java.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja_JP.UTF-8/man1/java.1 left in tree.
  178. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/unpack200.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/unpack200.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/unpack200.1 left in tree.
  179. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/tnameserv.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/tnameserv.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/tnameserv.1 left in tree.
  180. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/servertool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/servertool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/servertool.1 left in tree.
  181. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/rmiregistry.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/rmiregistry.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/rmiregistry.1 left in tree.
  182. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/rmid.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/rmid.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/rmid.1 left in tree.
  183. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/policytool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/policytool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/policytool.1 left in tree.
  184. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/pack200.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/pack200.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/pack200.1 left in tree.
  185. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/orbd.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/orbd.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/orbd.1 left in tree.
  186. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/keytool.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/keytool.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/keytool.1 left in tree.
  187. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/javaws.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/javaws.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/javaws.1 left in tree.
  188. CONFLICT (rename/delete): GeoSwitchover/template/java/man/ja/man1/java.1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/man/ja/man1/java.1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/man/ja/man1/java.1 left in tree.
  189. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/ZoneInfoMappings deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/ZoneInfoMappings in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/ZoneInfoMappings left in tree.
  190. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/WET deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/WET in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/WET left in tree.
  191. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/YST9YDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/YST9YDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/YST9YDT left in tree.
  192. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/YST9 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/YST9 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/YST9 left in tree.
  193. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/PST8PDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/PST8PDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/PST8PDT left in tree.
  194. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/PST8 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/PST8 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/PST8 left in tree.
  195. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/MST7MDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/MST7MDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/MST7MDT left in tree.
  196. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/MST7 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/MST7 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/MST7 left in tree.
  197. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/HST10 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/HST10 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/HST10 left in tree.
  198. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/EST5EDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/EST5EDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/EST5EDT left in tree.
  199. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/EST5 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/EST5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/EST5 left in tree.
  200. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/CST6CDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/CST6CDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/CST6CDT left in tree.
  201. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/CST6 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/CST6 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/CST6 left in tree.
  202. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/AST4ADT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/AST4ADT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/AST4ADT left in tree.
  203. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/SystemV/AST4 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/SystemV/AST4 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/SystemV/AST4 left in tree.
  204. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Wallis deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Wallis in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Wallis left in tree.
  205. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Wake deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Wake in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Wake left in tree.
  206. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Tongatapu deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Tongatapu in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Tongatapu left in tree.
  207. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Tarawa deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Tarawa in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Tarawa left in tree.
  208. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Tahiti deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Tahiti in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Tahiti left in tree.
  209. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Saipan deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Saipan in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Saipan left in tree.
  210. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Rarotonga deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Rarotonga in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Rarotonga left in tree.
  211. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Port_Moresby deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Port_Moresby in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Port_Moresby left in tree.
  212. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Pohnpei deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Pohnpei in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Pohnpei left in tree.
  213. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Pitcairn deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Pitcairn in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Pitcairn left in tree.
  214. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Palau deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Palau in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Palau left in tree.
  215. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Pago_Pago deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Pago_Pago in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Pago_Pago left in tree.
  216. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Noumea deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Noumea in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Noumea left in tree.
  217. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Norfolk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Norfolk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Norfolk left in tree.
  218. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Niue deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Niue in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Niue left in tree.
  219. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Nauru deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Nauru in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Nauru left in tree.
  220. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Midway deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Midway in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Midway left in tree.
  221. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Marquesas deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Marquesas in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Marquesas left in tree.
  222. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Majuro deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Majuro in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Majuro left in tree.
  223. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Kwajalein deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Kwajalein in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Kwajalein left in tree.
  224. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Kosrae deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Kosrae in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Kosrae left in tree.
  225. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Kiritimati deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Kiritimati in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Kiritimati left in tree.
  226. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Johnston deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Johnston in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Johnston left in tree.
  227. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Honolulu deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Honolulu in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Honolulu left in tree.
  228. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Guam deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Guam in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Guam left in tree.
  229. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Guadalcanal deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Guadalcanal in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Guadalcanal left in tree.
  230. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Gambier deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Gambier in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Gambier left in tree.
  231. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Galapagos deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Galapagos in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Galapagos left in tree.
  232. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Funafuti deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Funafuti in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Funafuti left in tree.
  233. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Fiji deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Fiji in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Fiji left in tree.
  234. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Fakaofo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Fakaofo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Fakaofo left in tree.
  235. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Enderbury deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Enderbury in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Enderbury left in tree.
  236. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Efate deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Efate in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Efate left in tree.
  237. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Easter deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Easter in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Easter left in tree.
  238. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Chuuk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Chuuk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Chuuk left in tree.
  239. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Chatham deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Chatham in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Chatham left in tree.
  240. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Auckland deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Auckland in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Auckland left in tree.
  241. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Pacific/Apia deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Pacific/Apia in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Pacific/Apia left in tree.
  242. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/PST8PDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/PST8PDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/PST8PDT left in tree.
  243. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/MST7MDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/MST7MDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/MST7MDT left in tree.
  244. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/MST deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/MST in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/MST left in tree.
  245. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/MET deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/MET in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/MET left in tree.
  246. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Reunion deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Reunion in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Reunion left in tree.
  247. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Mayotte deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Mayotte in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Mayotte left in tree.
  248. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Mauritius deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Mauritius in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Mauritius left in tree.
  249. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Maldives deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Maldives in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Maldives left in tree.
  250. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Mahe deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Mahe in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Mahe left in tree.
  251. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Kerguelen deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Kerguelen in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Kerguelen left in tree.
  252. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Comoro deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Comoro in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Comoro left in tree.
  253. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Cocos deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Cocos in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Cocos left in tree.
  254. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Christmas deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Christmas in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Christmas left in tree.
  255. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Chagos deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Chagos in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Chagos left in tree.
  256. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Indian/Antananarivo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Indian/Antananarivo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Indian/Antananarivo left in tree.
  257. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/HST deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/HST in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/HST left in tree.
  258. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/GMT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/GMT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/GMT left in tree.
  259. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Zurich deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Zurich in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Zurich left in tree.
  260. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Zaporozhye deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Zaporozhye in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Zaporozhye left in tree.
  261. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Warsaw deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Warsaw in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Warsaw left in tree.
  262. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Volgograd deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Volgograd in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Volgograd left in tree.
  263. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Vilnius deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Vilnius in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Vilnius left in tree.
  264. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Vienna deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Vienna in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Vienna left in tree.
  265. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Vaduz deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Vaduz in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Vaduz left in tree.
  266. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Uzhgorod deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Uzhgorod in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Uzhgorod left in tree.
  267. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Tirane deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Tirane in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Tirane left in tree.
  268. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Tallinn deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Tallinn in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Tallinn left in tree.
  269. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Stockholm deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Stockholm in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Stockholm left in tree.
  270. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Sofia deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Sofia in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Sofia left in tree.
  271. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Simferopol deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Simferopol in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Simferopol left in tree.
  272. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Samara deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Samara in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Samara left in tree.
  273. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Rome deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Rome in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Rome left in tree.
  274. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Riga deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Riga in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Riga left in tree.
  275. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Prague deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Prague in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Prague left in tree.
  276. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Paris deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Paris in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Paris left in tree.
  277. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Oslo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Oslo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Oslo left in tree.
  278. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Moscow deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Moscow in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Moscow left in tree.
  279. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Monaco deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Monaco in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Monaco left in tree.
  280. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Minsk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Minsk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Minsk left in tree.
  281. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Malta deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Malta in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Malta left in tree.
  282. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Madrid deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Madrid in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Madrid left in tree.
  283. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Luxembourg deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Luxembourg in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Luxembourg left in tree.
  284. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/London deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/London in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/London left in tree.
  285. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Lisbon deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Lisbon in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Lisbon left in tree.
  286. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Kiev deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Kiev in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Kiev left in tree.
  287. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Kaliningrad deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Kaliningrad in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Kaliningrad left in tree.
  288. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Istanbul deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Istanbul in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Istanbul left in tree.
  289. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Helsinki deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Helsinki in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Helsinki left in tree.
  290. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Gibraltar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Gibraltar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Gibraltar left in tree.
  291. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Dublin deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Dublin in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Dublin left in tree.
  292. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Copenhagen deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Copenhagen in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Copenhagen left in tree.
  293. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Chisinau deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Chisinau in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Chisinau left in tree.
  294. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Budapest deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Budapest in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Budapest left in tree.
  295. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Bucharest deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Bucharest in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Bucharest left in tree.
  296. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Brussels deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Brussels in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Brussels left in tree.
  297. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Berlin deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Berlin in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Berlin left in tree.
  298. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Belgrade deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Belgrade in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Belgrade left in tree.
  299. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Athens deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Athens in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Athens left in tree.
  300. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Andorra deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Andorra in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Andorra left in tree.
  301. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Europe/Amsterdam deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Europe/Amsterdam in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Europe/Amsterdam left in tree.
  302. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/UTC deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/UTC in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/UTC left in tree.
  303. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/UCT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/UCT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/UCT left in tree.
  304. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-9 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-9 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-9 left in tree.
  305. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-8 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-8 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-8 left in tree.
  306. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-7 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-7 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-7 left in tree.
  307. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-6 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-6 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-6 left in tree.
  308. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-5 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-5 left in tree.
  309. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-4 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-4 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-4 left in tree.
  310. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-3 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-3 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-3 left in tree.
  311. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-2 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-2 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-2 left in tree.
  312. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-14 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-14 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-14 left in tree.
  313. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-13 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-13 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-13 left in tree.
  314. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-12 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-12 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-12 left in tree.
  315. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-11 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-11 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-11 left in tree.
  316. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-10 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-10 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-10 left in tree.
  317. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT-1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT-1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT-1 left in tree.
  318. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+9 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+9 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+9 left in tree.
  319. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+8 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+8 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+8 left in tree.
  320. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+7 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+7 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+7 left in tree.
  321. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+6 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+6 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+6 left in tree.
  322. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+5 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+5 left in tree.
  323. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+4 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+4 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+4 left in tree.
  324. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+3 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+3 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+3 left in tree.
  325. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+2 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+2 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+2 left in tree.
  326. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+12 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+12 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+12 left in tree.
  327. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+11 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+11 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+11 left in tree.
  328. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+10 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+10 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+10 left in tree.
  329. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT+1 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT+1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT+1 left in tree.
  330. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Etc/GMT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Etc/GMT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Etc/GMT left in tree.
  331. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/EST5EDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/EST5EDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/EST5EDT left in tree.
  332. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/EST deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/EST in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/EST left in tree.
  333. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/EET deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/EET in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/EET left in tree.
  334. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/CST6CDT deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/CST6CDT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/CST6CDT left in tree.
  335. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/CET deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/CET in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/CET left in tree.
  336. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Sydney deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Sydney in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Sydney left in tree.
  337. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Perth deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Perth in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Perth left in tree.
  338. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Melbourne deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Melbourne in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Melbourne left in tree.
  339. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Lord_Howe deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Lord_Howe in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Lord_Howe left in tree.
  340. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Lindeman deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Lindeman in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Lindeman left in tree.
  341. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Hobart deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Hobart in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Hobart left in tree.
  342. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Eucla deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Eucla in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Eucla left in tree.
  343. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Darwin deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Darwin in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Darwin left in tree.
  344. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Currie deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Currie in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Currie left in tree.
  345. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Broken_Hill deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Broken_Hill in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Broken_Hill left in tree.
  346. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Brisbane deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Brisbane in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Brisbane left in tree.
  347. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Australia/Adelaide deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Australia/Adelaide in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Australia/Adelaide left in tree.
  348. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/Stanley deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/Stanley in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/Stanley left in tree.
  349. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/St_Helena deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/St_Helena in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/St_Helena left in tree.
  350. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/South_Georgia deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/South_Georgia in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/South_Georgia left in tree.
  351. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/Reykjavik deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/Reykjavik in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/Reykjavik left in tree.
  352. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/Madeira deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/Madeira in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/Madeira left in tree.
  353. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/Faroe deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/Faroe in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/Faroe left in tree.
  354. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/Cape_Verde deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/Cape_Verde in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/Cape_Verde left in tree.
  355. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/Canary deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/Canary in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/Canary left in tree.
  356. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/Bermuda deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/Bermuda in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/Bermuda left in tree.
  357. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Atlantic/Azores deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Atlantic/Azores in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Atlantic/Azores left in tree.
  358. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Yerevan deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Yerevan in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Yerevan left in tree.
  359. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Yekaterinburg deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Yekaterinburg in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Yekaterinburg left in tree.
  360. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Yakutsk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Yakutsk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Yakutsk left in tree.
  361. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Vladivostok deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Vladivostok in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Vladivostok left in tree.
  362. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Vientiane deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Vientiane in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Vientiane left in tree.
  363. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Urumqi deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Urumqi in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Urumqi left in tree.
  364. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Ulaanbaatar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Ulaanbaatar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Ulaanbaatar left in tree.
  365. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Tokyo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Tokyo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Tokyo left in tree.
  366. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Thimphu deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Thimphu in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Thimphu left in tree.
  367. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Tehran deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Tehran in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Tehran left in tree.
  368. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Tbilisi deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Tbilisi in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Tbilisi left in tree.
  369. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Tashkent deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Tashkent in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Tashkent left in tree.
  370. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Taipei deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Taipei in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Taipei left in tree.
  371. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Singapore deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Singapore in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Singapore left in tree.
  372. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Shanghai deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Shanghai in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Shanghai left in tree.
  373. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Seoul deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Seoul in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Seoul left in tree.
  374. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Samarkand deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Samarkand in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Samarkand left in tree.
  375. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Sakhalin deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Sakhalin in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Sakhalin left in tree.
  376. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Riyadh89 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Riyadh89 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Riyadh89 left in tree.
  377. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Riyadh88 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Riyadh88 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Riyadh88 left in tree.
  378. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Riyadh87 deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Riyadh87 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Riyadh87 left in tree.
  379. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Riyadh deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Riyadh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Riyadh left in tree.
  380. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Rangoon deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Rangoon in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Rangoon left in tree.
  381. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Qyzylorda deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Qyzylorda in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Qyzylorda left in tree.
  382. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Qatar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Qatar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Qatar left in tree.
  383. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Pyongyang deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Pyongyang in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Pyongyang left in tree.
  384. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Pontianak deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Pontianak in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Pontianak left in tree.
  385. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Phnom_Penh deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Phnom_Penh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Phnom_Penh left in tree.
  386. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Oral deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Oral in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Oral left in tree.
  387. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Omsk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Omsk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Omsk left in tree.
  388. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Novosibirsk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Novosibirsk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Novosibirsk left in tree.
  389. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Novokuznetsk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Novokuznetsk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Novokuznetsk left in tree.
  390. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Nicosia deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Nicosia in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Nicosia left in tree.
  391. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Muscat deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Muscat in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Muscat left in tree.
  392. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Manila deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Manila in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Manila left in tree.
  393. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Makassar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Makassar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Makassar left in tree.
  394. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Magadan deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Magadan in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Magadan left in tree.
  395. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Macau deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Macau in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Macau left in tree.
  396. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Kuwait deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Kuwait in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Kuwait left in tree.
  397. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Kuching deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Kuching in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Kuching left in tree.
  398. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Kuala_Lumpur deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Kuala_Lumpur in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Kuala_Lumpur left in tree.
  399. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Krasnoyarsk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Krasnoyarsk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Krasnoyarsk left in tree.
  400. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Kolkata deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Kolkata in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Kolkata left in tree.
  401. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Kathmandu deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Kathmandu in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Kathmandu left in tree.
  402. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Kashgar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Kashgar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Kashgar left in tree.
  403. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Karachi deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Karachi in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Karachi left in tree.
  404. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Kamchatka deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Kamchatka in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Kamchatka left in tree.
  405. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Kabul deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Kabul in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Kabul left in tree.
  406. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Jerusalem deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Jerusalem in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Jerusalem left in tree.
  407. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Jayapura deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Jayapura in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Jayapura left in tree.
  408. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Jakarta deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Jakarta in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Jakarta left in tree.
  409. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Irkutsk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Irkutsk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Irkutsk left in tree.
  410. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Hovd deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Hovd in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Hovd left in tree.
  411. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Hong_Kong deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Hong_Kong in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Hong_Kong left in tree.
  412. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Ho_Chi_Minh deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Ho_Chi_Minh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Ho_Chi_Minh left in tree.
  413. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Harbin deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Harbin in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Harbin left in tree.
  414. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Gaza deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Gaza in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Gaza left in tree.
  415. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Dushanbe deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Dushanbe in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Dushanbe left in tree.
  416. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Dubai deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Dubai in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Dubai left in tree.
  417. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Dili deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Dili in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Dili left in tree.
  418. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Dhaka deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Dhaka in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Dhaka left in tree.
  419. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Damascus deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Damascus in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Damascus left in tree.
  420. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Colombo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Colombo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Colombo left in tree.
  421. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Chongqing deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Chongqing in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Chongqing left in tree.
  422. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Choibalsan deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Choibalsan in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Choibalsan left in tree.
  423. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Brunei deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Brunei in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Brunei left in tree.
  424. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Bishkek deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Bishkek in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Bishkek left in tree.
  425. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Beirut deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Beirut in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Beirut left in tree.
  426. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Bangkok deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Bangkok in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Bangkok left in tree.
  427. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Baku deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Baku in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Baku left in tree.
  428. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Bahrain deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Bahrain in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Bahrain left in tree.
  429. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Baghdad deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Baghdad in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Baghdad left in tree.
  430. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Ashgabat deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Ashgabat in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Ashgabat left in tree.
  431. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Aqtobe deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Aqtobe in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Aqtobe left in tree.
  432. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Aqtau deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Aqtau in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Aqtau left in tree.
  433. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Anadyr deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Anadyr in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Anadyr left in tree.
  434. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Amman deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Amman in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Amman left in tree.
  435. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Almaty deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Almaty in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Almaty left in tree.
  436. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Asia/Aden deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Asia/Aden in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Asia/Aden left in tree.
  437. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/Vostok deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/Vostok in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/Vostok left in tree.
  438. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/Syowa deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/Syowa in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/Syowa left in tree.
  439. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/Rothera deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/Rothera in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/Rothera left in tree.
  440. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/Palmer deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/Palmer in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/Palmer left in tree.
  441. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/McMurdo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/McMurdo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/McMurdo left in tree.
  442. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/Mawson deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/Mawson in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/Mawson left in tree.
  443. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/Macquarie deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/Macquarie in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/Macquarie left in tree.
  444. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/DumontDUrville deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/DumontDUrville in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/DumontDUrville left in tree.
  445. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/Davis deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/Davis in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/Davis left in tree.
  446. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Antarctica/Casey deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Antarctica/Casey in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Antarctica/Casey left in tree.
  447. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Yellowknife deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Yellowknife in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Yellowknife left in tree.
  448. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Yakutat deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Yakutat in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Yakutat left in tree.
  449. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Winnipeg deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Winnipeg in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Winnipeg left in tree.
  450. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Whitehorse deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Whitehorse in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Whitehorse left in tree.
  451. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Vancouver deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Vancouver in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Vancouver left in tree.
  452. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Tortola deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Tortola in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Tortola left in tree.
  453. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Toronto deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Toronto in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Toronto left in tree.
  454. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Tijuana deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Tijuana in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Tijuana left in tree.
  455. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Thunder_Bay deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Thunder_Bay in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Thunder_Bay left in tree.
  456. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Thule deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Thule in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Thule left in tree.
  457. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Tegucigalpa deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Tegucigalpa in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Tegucigalpa left in tree.
  458. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Swift_Current deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Swift_Current in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Swift_Current left in tree.
  459. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/St_Vincent deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/St_Vincent in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/St_Vincent left in tree.
  460. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/St_Thomas deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/St_Thomas in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/St_Thomas left in tree.
  461. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/St_Lucia deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/St_Lucia in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/St_Lucia left in tree.
  462. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/St_Kitts deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/St_Kitts in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/St_Kitts left in tree.
  463. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/St_Johns deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/St_Johns in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/St_Johns left in tree.
  464. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Sitka deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Sitka in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Sitka left in tree.
  465. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Scoresbysund deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Scoresbysund in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Scoresbysund left in tree.
  466. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Sao_Paulo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Sao_Paulo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Sao_Paulo left in tree.
  467. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Santo_Domingo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Santo_Domingo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Santo_Domingo left in tree.
  468. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Santiago deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Santiago in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Santiago left in tree.
  469. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Santarem deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Santarem in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Santarem left in tree.
  470. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Santa_Isabel deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Santa_Isabel in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Santa_Isabel left in tree.
  471. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Rio_Branco deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Rio_Branco in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Rio_Branco left in tree.
  472. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Resolute deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Resolute in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Resolute left in tree.
  473. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Regina deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Regina in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Regina left in tree.
  474. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Recife deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Recife in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Recife left in tree.
  475. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Rankin_Inlet deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Rankin_Inlet in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Rankin_Inlet left in tree.
  476. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Rainy_River deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Rainy_River in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Rainy_River left in tree.
  477. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Puerto_Rico deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Puerto_Rico in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Puerto_Rico left in tree.
  478. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Porto_Velho deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Porto_Velho in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Porto_Velho left in tree.
  479. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Port_of_Spain deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Port_of_Spain in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Port_of_Spain left in tree.
  480. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Port-au-Prince deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Port-au-Prince in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Port-au-Prince left in tree.
  481. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Phoenix deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Phoenix in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Phoenix left in tree.
  482. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Paramaribo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Paramaribo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Paramaribo left in tree.
  483. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Pangnirtung deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Pangnirtung in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Pangnirtung left in tree.
  484. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Panama deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Panama in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Panama left in tree.
  485. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Ojinaga deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Ojinaga in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Ojinaga left in tree.
  486. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/North_Dakota/New_Salem deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/North_Dakota/New_Salem in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/North_Dakota/New_Salem left in tree.
  487. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/North_Dakota/Center deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/North_Dakota/Center in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/North_Dakota/Center left in tree.
  488. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/North_Dakota/Beulah deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/North_Dakota/Beulah in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/North_Dakota/Beulah left in tree.
  489. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Noronha deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Noronha in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Noronha left in tree.
  490. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Nome deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Nome in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Nome left in tree.
  491. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Nipigon deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Nipigon in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Nipigon left in tree.
  492. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/New_York deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/New_York in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/New_York left in tree.
  493. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Nassau deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Nassau in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Nassau left in tree.
  494. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Montserrat deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Montserrat in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Montserrat left in tree.
  495. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Montreal deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Montreal in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Montreal left in tree.
  496. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Montevideo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Montevideo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Montevideo left in tree.
  497. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Monterrey deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Monterrey in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Monterrey left in tree.
  498. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Moncton deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Moncton in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Moncton left in tree.
  499. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Miquelon deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Miquelon in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Miquelon left in tree.
  500. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Mexico_City deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Mexico_City in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Mexico_City left in tree.
  501. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Metlakatla deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Metlakatla in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Metlakatla left in tree.
  502. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Merida deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Merida in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Merida left in tree.
  503. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Menominee deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Menominee in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Menominee left in tree.
  504. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Mazatlan deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Mazatlan in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Mazatlan left in tree.
  505. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Matamoros deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Matamoros in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Matamoros left in tree.
  506. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Martinique deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Martinique in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Martinique left in tree.
  507. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Manaus deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Manaus in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Manaus left in tree.
  508. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Managua deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Managua in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Managua left in tree.
  509. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Maceio deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Maceio in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Maceio left in tree.
  510. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Los_Angeles deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Los_Angeles in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Los_Angeles left in tree.
  511. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Lima deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Lima in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Lima left in tree.
  512. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/La_Paz deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/La_Paz in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/La_Paz left in tree.
  513. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Kentucky/Monticello deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Kentucky/Monticello in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Kentucky/Monticello left in tree.
  514. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Kentucky/Louisville deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Kentucky/Louisville in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Kentucky/Louisville left in tree.
  515. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Juneau deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Juneau in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Juneau left in tree.
  516. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Jamaica deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Jamaica in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Jamaica left in tree.
  517. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Iqaluit deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Iqaluit in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Iqaluit left in tree.
  518. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Inuvik deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Inuvik in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Inuvik left in tree.
  519. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Indiana/Winamac deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Indiana/Winamac in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Indiana/Winamac left in tree.
  520. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Indiana/Vincennes deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Indiana/Vincennes in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Indiana/Vincennes left in tree.
  521. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Indiana/Vevay deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Indiana/Vevay in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Indiana/Vevay left in tree.
  522. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Indiana/Tell_City deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Indiana/Tell_City in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Indiana/Tell_City left in tree.
  523. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Indiana/Petersburg deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Indiana/Petersburg in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Indiana/Petersburg left in tree.
  524. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Indiana/Marengo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Indiana/Marengo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Indiana/Marengo left in tree.
  525. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Indiana/Knox deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Indiana/Knox in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Indiana/Knox left in tree.
  526. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Indiana/Indianapolis deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Indiana/Indianapolis in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Indiana/Indianapolis left in tree.
  527. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Hermosillo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Hermosillo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Hermosillo left in tree.
  528. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Havana deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Havana in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Havana left in tree.
  529. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Halifax deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Halifax in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Halifax left in tree.
  530. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Guyana deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Guyana in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Guyana left in tree.
  531. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Guayaquil deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Guayaquil in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Guayaquil left in tree.
  532. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Guatemala deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Guatemala in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Guatemala left in tree.
  533. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Guadeloupe deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Guadeloupe in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Guadeloupe left in tree.
  534. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Grenada deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Grenada in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Grenada left in tree.
  535. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Grand_Turk deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Grand_Turk in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Grand_Turk left in tree.
  536. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Goose_Bay deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Goose_Bay in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Goose_Bay left in tree.
  537. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Godthab deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Godthab in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Godthab left in tree.
  538. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Glace_Bay deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Glace_Bay in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Glace_Bay left in tree.
  539. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Fortaleza deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Fortaleza in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Fortaleza left in tree.
  540. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/El_Salvador deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/El_Salvador in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/El_Salvador left in tree.
  541. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Eirunepe deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Eirunepe in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Eirunepe left in tree.
  542. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Edmonton deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Edmonton in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Edmonton left in tree.
  543. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Dominica deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Dominica in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Dominica left in tree.
  544. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Detroit deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Detroit in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Detroit left in tree.
  545. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Denver deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Denver in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Denver left in tree.
  546. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Dawson_Creek deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Dawson_Creek in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Dawson_Creek left in tree.
  547. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Dawson deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Dawson in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Dawson left in tree.
  548. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Danmarkshavn deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Danmarkshavn in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Danmarkshavn left in tree.
  549. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Curacao deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Curacao in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Curacao left in tree.
  550. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Cuiaba deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Cuiaba in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Cuiaba left in tree.
  551. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Costa_Rica deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Costa_Rica in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Costa_Rica left in tree.
  552. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Chihuahua deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Chihuahua in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Chihuahua left in tree.
  553. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Chicago deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Chicago in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Chicago left in tree.
  554. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Cayman deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Cayman in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Cayman left in tree.
  555. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Cayenne deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Cayenne in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Cayenne left in tree.
  556. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Caracas deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Caracas in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Caracas left in tree.
  557. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Cancun deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Cancun in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Cancun left in tree.
  558. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Campo_Grande deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Campo_Grande in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Campo_Grande left in tree.
  559. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Cambridge_Bay deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Cambridge_Bay in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Cambridge_Bay left in tree.
  560. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Boise deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Boise in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Boise left in tree.
  561. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Bogota deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Bogota in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Bogota left in tree.
  562. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Boa_Vista deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Boa_Vista in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Boa_Vista left in tree.
  563. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Blanc-Sablon deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Blanc-Sablon in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Blanc-Sablon left in tree.
  564. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Belize deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Belize in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Belize left in tree.
  565. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Belem deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Belem in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Belem left in tree.
  566. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Barbados deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Barbados in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Barbados left in tree.
  567. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Bahia_Banderas deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Bahia_Banderas in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Bahia_Banderas left in tree.
  568. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Bahia deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Bahia in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Bahia left in tree.
  569. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Atikokan deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Atikokan in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Atikokan left in tree.
  570. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Asuncion deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Asuncion in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Asuncion left in tree.
  571. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Aruba deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Aruba in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Aruba left in tree.
  572. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Ushuaia deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Ushuaia in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Ushuaia left in tree.
  573. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Tucuman deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Tucuman in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Tucuman left in tree.
  574. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/San_Luis deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/San_Luis in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/San_Luis left in tree.
  575. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/San_Juan deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/San_Juan in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/San_Juan left in tree.
  576. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Salta deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Salta in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Salta left in tree.
  577. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Rio_Gallegos deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Rio_Gallegos in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Rio_Gallegos left in tree.
  578. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Mendoza deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Mendoza in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Mendoza left in tree.
  579. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/La_Rioja deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/La_Rioja in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/La_Rioja left in tree.
  580. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Jujuy deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Jujuy in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Jujuy left in tree.
  581. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Cordoba deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Cordoba in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Cordoba left in tree.
  582. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Catamarca deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Catamarca in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Catamarca left in tree.
  583. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Argentina/Buenos_Aires deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Argentina/Buenos_Aires in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Argentina/Buenos_Aires left in tree.
  584. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Araguaina deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Araguaina in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Araguaina left in tree.
  585. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Antigua deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Antigua in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Antigua left in tree.
  586. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Anguilla deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Anguilla in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Anguilla left in tree.
  587. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Anchorage deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Anchorage in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Anchorage left in tree.
  588. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/America/Adak deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/America/Adak in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/America/Adak left in tree.
  589. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Windhoek deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Windhoek in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Windhoek left in tree.
  590. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Tunis deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Tunis in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Tunis left in tree.
  591. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Tripoli deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Tripoli in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Tripoli left in tree.
  592. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Sao_Tome deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Sao_Tome in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Sao_Tome left in tree.
  593. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Porto-Novo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Porto-Novo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Porto-Novo left in tree.
  594. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Ouagadougou deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Ouagadougou in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Ouagadougou left in tree.
  595. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Nouakchott deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Nouakchott in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Nouakchott left in tree.
  596. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Niamey deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Niamey in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Niamey left in tree.
  597. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Ndjamena deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Ndjamena in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Ndjamena left in tree.
  598. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Nairobi deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Nairobi in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Nairobi left in tree.
  599. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Monrovia deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Monrovia in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Monrovia left in tree.
  600. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Mogadishu deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Mogadishu in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Mogadishu left in tree.
  601. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Mbabane deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Mbabane in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Mbabane left in tree.
  602. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Maseru deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Maseru in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Maseru left in tree.
  603. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Maputo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Maputo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Maputo left in tree.
  604. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Malabo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Malabo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Malabo left in tree.
  605. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Lusaka deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Lusaka in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Lusaka left in tree.
  606. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Lubumbashi deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Lubumbashi in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Lubumbashi left in tree.
  607. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Luanda deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Luanda in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Luanda left in tree.
  608. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Lome deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Lome in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Lome left in tree.
  609. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Libreville deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Libreville in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Libreville left in tree.
  610. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Lagos deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Lagos in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Lagos left in tree.
  611. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Kinshasa deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Kinshasa in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Kinshasa left in tree.
  612. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Kigali deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Kigali in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Kigali left in tree.
  613. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Khartoum deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Khartoum in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Khartoum left in tree.
  614. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Kampala deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Kampala in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Kampala left in tree.
  615. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Johannesburg deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Johannesburg in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Johannesburg left in tree.
  616. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Harare deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Harare in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Harare left in tree.
  617. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Gaborone deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Gaborone in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Gaborone left in tree.
  618. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Freetown deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Freetown in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Freetown left in tree.
  619. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/El_Aaiun deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/El_Aaiun in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/El_Aaiun left in tree.
  620. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Douala deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Douala in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Douala left in tree.
  621. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Djibouti deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Djibouti in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Djibouti left in tree.
  622. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Dar_es_Salaam deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Dar_es_Salaam in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Dar_es_Salaam left in tree.
  623. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Dakar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Dakar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Dakar left in tree.
  624. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Conakry deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Conakry in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Conakry left in tree.
  625. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Ceuta deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Ceuta in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Ceuta left in tree.
  626. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Casablanca deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Casablanca in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Casablanca left in tree.
  627. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Cairo deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Cairo in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Cairo left in tree.
  628. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Bujumbura deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Bujumbura in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Bujumbura left in tree.
  629. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Brazzaville deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Brazzaville in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Brazzaville left in tree.
  630. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Blantyre deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Blantyre in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Blantyre left in tree.
  631. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Bissau deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Bissau in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Bissau left in tree.
  632. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Banjul deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Banjul in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Banjul left in tree.
  633. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Bangui deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Bangui in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Bangui left in tree.
  634. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Bamako deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Bamako in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Bamako left in tree.
  635. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Asmara deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Asmara in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Asmara left in tree.
  636. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Algiers deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Algiers in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Algiers left in tree.
  637. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Addis_Ababa deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Addis_Ababa in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Addis_Ababa left in tree.
  638. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Accra deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Accra in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Accra left in tree.
  639. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/zi/Africa/Abidjan deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/zi/Africa/Abidjan in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/zi/Africa/Abidjan left in tree.
  640. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/servicetag/jdk_header.png deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/servicetag/jdk_header.png in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/servicetag/jdk_header.png left in tree.
  641. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/security/trusted.libraries deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/security/trusted.libraries in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/security/trusted.libraries left in tree.
  642. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/security/local_policy.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/security/local_policy.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/security/local_policy.jar left in tree.
  643. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/security/java.policy deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/security/java.policy in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/security/java.policy left in tree.
  644. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/security/blacklist deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/security/blacklist in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/security/blacklist left in tree.
  645. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/security/US_export_policy.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/security/US_export_policy.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/security/US_export_policy.jar left in tree.
  646. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/plugin.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/plugin.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/plugin.jar left in tree.
  647. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/management-agent.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/management-agent.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/management-agent.jar left in tree.
  648. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/jsse.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/jsse.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/jsse.jar left in tree.
  649. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/jexec deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/jexec in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/jexec left in tree.
  650. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/jce.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/jce.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/jce.jar left in tree.
  651. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/javaws.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/javaws.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/javaws.jar left in tree.
  652. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/fontconfig.bfc deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/fontconfig.bfc in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/fontconfig.bfc left in tree.
  653. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/ext/zipfs.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/ext/zipfs.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/ext/zipfs.jar left in tree.
  654. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/ext/sunpkcs11.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/ext/sunpkcs11.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/ext/sunpkcs11.jar left in tree.
  655. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/ext/sunjce_provider.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/ext/sunjce_provider.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/ext/sunjce_provider.jar left in tree.
  656. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/ext/sunec.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/ext/sunec.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/ext/sunec.jar left in tree.
  657. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/ext/meta-index deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/ext/meta-index in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/ext/meta-index left in tree.
  658. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/ext/localedata.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/ext/localedata.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/ext/localedata.jar left in tree.
  659. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/ext/dnsns.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/ext/dnsns.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/ext/dnsns.jar left in tree.
  660. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/deploy/splash.gif deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/deploy/splash.gif in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/deploy/splash.gif left in tree.
  661. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/deploy/ffjcext.zip deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/deploy/ffjcext.zip in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/deploy/ffjcext.zip left in tree.
  662. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/deploy.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/deploy.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/deploy.jar left in tree.
  663. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/currency.data deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/currency.data in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/currency.data left in tree.
  664. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/charsets.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/charsets.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/charsets.jar left in tree.
  665. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/xawt/libmawt.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/xawt/libmawt.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/xawt/libmawt.so left in tree.
  666. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/server/libjvm.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/server/libjvm.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/server/libjvm.so left in tree.
  667. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/server/libjsig.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/server/libjsig.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/server/libjsig.so left in tree.
  668. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libzip.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libzip.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libzip.so left in tree.
  669. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libverify.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libverify.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libverify.so left in tree.
  670. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libunpack.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libunpack.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libunpack.so left in tree.
  671. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libt2k.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libt2k.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libt2k.so left in tree.
  672. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libsunec.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libsunec.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libsunec.so left in tree.
  673. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libsplashscreen.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libsplashscreen.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libsplashscreen.so left in tree.
  674. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libsctp.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libsctp.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libsctp.so left in tree.
  675. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/librmi.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/librmi.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/librmi.so left in tree.
  676. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libnpt.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libnpt.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libnpt.so left in tree.
  677. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libnpjp2.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libnpjp2.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libnpjp2.so left in tree.
  678. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libnio.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libnio.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libnio.so left in tree.
  679. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libnet.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libnet.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libnet.so left in tree.
  680. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libmanagement.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libmanagement.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libmanagement.so left in tree.
  681. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libkcms.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libkcms.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libkcms.so left in tree.
  682. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libjsoundalsa.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libjsoundalsa.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libjsoundalsa.so left in tree.
  683. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libjsig.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libjsig.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libjsig.so left in tree.
  684. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libjdwp.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libjdwp.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libjdwp.so left in tree.
  685. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libjawt.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libjawt.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libjawt.so left in tree.
  686. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libjavaplugin_jni.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libjavaplugin_jni.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libjavaplugin_jni.so left in tree.
  687. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libjava_crw_demo.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libjava_crw_demo.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libjava_crw_demo.so left in tree.
  688. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libjava.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libjava.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libjava.so left in tree.
  689. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libjaas_unix.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libjaas_unix.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libjaas_unix.so left in tree.
  690. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libj2pkcs11.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libj2pkcs11.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libj2pkcs11.so left in tree.
  691. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libj2pcsc.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libj2pcsc.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libj2pcsc.so left in tree.
  692. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libj2gss.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libj2gss.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libj2gss.so left in tree.
  693. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libinstrument.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libinstrument.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libinstrument.so left in tree.
  694. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libhprof.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libhprof.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libhprof.so left in tree.
  695. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libfontmanager.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libfontmanager.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libfontmanager.so left in tree.
  696. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libdt_socket.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libdt_socket.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libdt_socket.so left in tree.
  697. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libdeploy.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libdeploy.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libdeploy.so left in tree.
  698. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libdcpr.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libdcpr.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libdcpr.so left in tree.
  699. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libawt.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libawt.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libawt.so left in tree.
  700. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/libJdbcOdbc.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/libJdbcOdbc.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/libJdbcOdbc.so left in tree.
  701. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/jli/libjli.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/jli/libjli.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/jli/libjli.so left in tree.
  702. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/amd64/headless/libmawt.so deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/amd64/headless/libmawt.so in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/amd64/headless/libmawt.so left in tree.
  703. CONFLICT (rename/delete): GeoSwitchover/template/java/lib/alt-rt.jar deleted in HEAD and renamed to GeoSwitchover/old/template/java/lib/alt-rt.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/lib/alt-rt.jar left in tree.
  704. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/unpack200 deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/unpack200 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/unpack200 left in tree.
  705. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/tnameserv deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/tnameserv in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/tnameserv left in tree.
  706. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/servertool deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/servertool in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/servertool left in tree.
  707. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/rmiregistry deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/rmiregistry in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/rmiregistry left in tree.
  708. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/rmid deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/rmid in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/rmid left in tree.
  709. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/policytool deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/policytool in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/policytool left in tree.
  710. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/pack200 deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/pack200 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/pack200 left in tree.
  711. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/orbd deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/orbd in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/orbd left in tree.
  712. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/keytool deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/keytool in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/keytool left in tree.
  713. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/javaws deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/javaws in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/javaws left in tree.
  714. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/java_vm deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/java_vm in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/java_vm left in tree.
  715. CONFLICT (rename/delete): GeoSwitchover/template/java/bin/java deleted in HEAD and renamed to GeoSwitchover/old/template/java/bin/java in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/bin/java left in tree.
  716. CONFLICT (rename/delete): GeoSwitchover/template/java/README deleted in HEAD and renamed to GeoSwitchover/old/template/java/README in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/README left in tree.
  717. CONFLICT (rename/delete): GeoSwitchover/template/java/COPYRIGHT deleted in HEAD and renamed to GeoSwitchover/old/template/java/COPYRIGHT in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/java/COPYRIGHT left in tree.
  718. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/xmltask.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/xmltask.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/xmltask.jar left in tree.
  719. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/xml-apis.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/xml-apis.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/xml-apis.jar left in tree.
  720. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/xercesImpl.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/xercesImpl.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/xercesImpl.jar left in tree.
  721. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/mysql-connector-java-5.1.7-bin.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/mysql-connector-java-5.1.7-bin.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/mysql-connector-java-5.1.7-bin.jar left in tree.
  722. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/libraries.properties deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/libraries.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/libraries.properties left in tree.
  723. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/install-util.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/install-util.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/install-util.jar left in tree.
  724. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/bcprov-jdk15-142.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/bcprov-jdk15-142.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/bcprov-jdk15-142.jar left in tree.
  725. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant.jar left in tree.
  726. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-trax.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-trax.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-trax.jar left in tree.
  727. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-trax-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-trax-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-trax-1.8.0.pom.sha512 left in tree.
  728. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-trax-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-trax-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-trax-1.8.0.pom.sha1 left in tree.
  729. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-trax-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-trax-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-trax-1.8.0.pom.md5 left in tree.
  730. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-trax-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-trax-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-trax-1.8.0.pom left in tree.
  731. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-testutil.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-testutil.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-testutil.jar left in tree.
  732. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-testutil-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-testutil-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-testutil-1.8.0.pom.sha512 left in tree.
  733. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-testutil-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-testutil-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-testutil-1.8.0.pom.sha1 left in tree.
  734. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-testutil-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-testutil-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-testutil-1.8.0.pom.md5 left in tree.
  735. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-testutil-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-testutil-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-testutil-1.8.0.pom left in tree.
  736. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-swing.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-swing.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-swing.jar left in tree.
  737. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-swing-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-swing-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-swing-1.8.0.pom.sha512 left in tree.
  738. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-swing-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-swing-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-swing-1.8.0.pom.sha1 left in tree.
  739. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-swing-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-swing-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-swing-1.8.0.pom.md5 left in tree.
  740. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-swing-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-swing-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-swing-1.8.0.pom left in tree.
  741. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-stylebook.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-stylebook.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-stylebook.jar left in tree.
  742. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-parent-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-parent-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-parent-1.8.0.pom.sha512 left in tree.
  743. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-parent-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-parent-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-parent-1.8.0.pom.sha1 left in tree.
  744. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-parent-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-parent-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-parent-1.8.0.pom.md5 left in tree.
  745. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-parent-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-parent-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-parent-1.8.0.pom left in tree.
  746. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-nodeps.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-nodeps.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-nodeps.jar left in tree.
  747. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-nodeps-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-nodeps-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-nodeps-1.8.0.pom.sha512 left in tree.
  748. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-nodeps-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-nodeps-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-nodeps-1.8.0.pom.sha1 left in tree.
  749. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-nodeps-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-nodeps-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-nodeps-1.8.0.pom.md5 left in tree.
  750. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-nodeps-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-nodeps-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-nodeps-1.8.0.pom left in tree.
  751. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-netrexx.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-netrexx.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-netrexx.jar left in tree.
  752. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-netrexx-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-netrexx-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-netrexx-1.8.0.pom.sha512 left in tree.
  753. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-netrexx-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-netrexx-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-netrexx-1.8.0.pom.sha1 left in tree.
  754. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-netrexx-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-netrexx-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-netrexx-1.8.0.pom.md5 left in tree.
  755. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-netrexx-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-netrexx-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-netrexx-1.8.0.pom left in tree.
  756. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-launcher.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-launcher.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-launcher.jar left in tree.
  757. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-launcher-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-launcher-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-launcher-1.8.0.pom.sha512 left in tree.
  758. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-launcher-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-launcher-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-launcher-1.8.0.pom.sha1 left in tree.
  759. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-launcher-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-launcher-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-launcher-1.8.0.pom.md5 left in tree.
  760. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-launcher-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-launcher-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-launcher-1.8.0.pom left in tree.
  761. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-junit.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-junit.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-junit.jar left in tree.
  762. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-junit-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-junit-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-junit-1.8.0.pom.sha512 left in tree.
  763. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-junit-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-junit-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-junit-1.8.0.pom.sha1 left in tree.
  764. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-junit-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-junit-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-junit-1.8.0.pom.md5 left in tree.
  765. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-junit-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-junit-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-junit-1.8.0.pom left in tree.
  766. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jsch.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jsch.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jsch.jar left in tree.
  767. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jsch-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jsch-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jsch-1.8.0.pom.sha512 left in tree.
  768. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jsch-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jsch-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jsch-1.8.0.pom.sha1 left in tree.
  769. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jsch-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jsch-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jsch-1.8.0.pom.md5 left in tree.
  770. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jsch-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jsch-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jsch-1.8.0.pom left in tree.
  771. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jmf.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jmf.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jmf.jar left in tree.
  772. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jmf-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jmf-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jmf-1.8.0.pom.sha512 left in tree.
  773. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jmf-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jmf-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jmf-1.8.0.pom.sha1 left in tree.
  774. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jmf-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jmf-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jmf-1.8.0.pom.md5 left in tree.
  775. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jmf-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jmf-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jmf-1.8.0.pom left in tree.
  776. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jdepend.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jdepend.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jdepend.jar left in tree.
  777. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jdepend-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jdepend-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jdepend-1.8.0.pom.sha512 left in tree.
  778. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jdepend-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jdepend-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jdepend-1.8.0.pom.sha1 left in tree.
  779. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jdepend-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jdepend-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jdepend-1.8.0.pom.md5 left in tree.
  780. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jdepend-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jdepend-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jdepend-1.8.0.pom left in tree.
  781. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-javamail.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-javamail.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-javamail.jar left in tree.
  782. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-javamail-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-javamail-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-javamail-1.8.0.pom.sha512 left in tree.
  783. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-javamail-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-javamail-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-javamail-1.8.0.pom.sha1 left in tree.
  784. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-javamail-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-javamail-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-javamail-1.8.0.pom.md5 left in tree.
  785. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-javamail-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-javamail-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-javamail-1.8.0.pom left in tree.
  786. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jai.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jai.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jai.jar left in tree.
  787. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jai-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jai-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jai-1.8.0.pom.sha512 left in tree.
  788. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jai-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jai-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jai-1.8.0.pom.sha1 left in tree.
  789. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jai-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jai-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jai-1.8.0.pom.md5 left in tree.
  790. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-jai-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-jai-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-jai-1.8.0.pom left in tree.
  791. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-contrib.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-contrib.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-contrib.jar left in tree.
  792. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-net.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-net.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-net.jar left in tree.
  793. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-net-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-net-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-net-1.8.0.pom.sha512 left in tree.
  794. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-net-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-net-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-net-1.8.0.pom.sha1 left in tree.
  795. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-net-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-net-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-net-1.8.0.pom.md5 left in tree.
  796. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-net-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-net-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-net-1.8.0.pom left in tree.
  797. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-logging.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-logging.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-logging.jar left in tree.
  798. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-logging-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-logging-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-logging-1.8.0.pom.sha512 left in tree.
  799. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-logging-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-logging-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-logging-1.8.0.pom.sha1 left in tree.
  800. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-logging-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-logging-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-logging-1.8.0.pom.md5 left in tree.
  801. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-commons-logging-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-commons-logging-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-commons-logging-1.8.0.pom left in tree.
  802. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-xalan2.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-xalan2.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-xalan2.jar left in tree.
  803. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-xalan2-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-xalan2-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-xalan2-1.8.0.pom.sha512 left in tree.
  804. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-xalan2-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-xalan2-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-xalan2-1.8.0.pom.sha1 left in tree.
  805. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-xalan2-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-xalan2-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-xalan2-1.8.0.pom.md5 left in tree.
  806. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-xalan2-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-xalan2-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-xalan2-1.8.0.pom left in tree.
  807. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-resolver.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-resolver.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-resolver.jar left in tree.
  808. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-resolver-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-resolver-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-resolver-1.8.0.pom.sha512 left in tree.
  809. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-resolver-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-resolver-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-resolver-1.8.0.pom.sha1 left in tree.
  810. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-resolver-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-resolver-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-resolver-1.8.0.pom.md5 left in tree.
  811. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-resolver-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-resolver-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-resolver-1.8.0.pom left in tree.
  812. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-regexp.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-regexp.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-regexp.jar left in tree.
  813. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-regexp-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-regexp-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-regexp-1.8.0.pom.sha512 left in tree.
  814. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-regexp-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-regexp-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-regexp-1.8.0.pom.sha1 left in tree.
  815. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-regexp-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-regexp-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-regexp-1.8.0.pom.md5 left in tree.
  816. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-regexp-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-regexp-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-regexp-1.8.0.pom left in tree.
  817. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-oro.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-oro.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-oro.jar left in tree.
  818. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-oro-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-oro-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-oro-1.8.0.pom.sha512 left in tree.
  819. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-oro-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-oro-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-oro-1.8.0.pom.sha1 left in tree.
  820. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-oro-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-oro-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-oro-1.8.0.pom.md5 left in tree.
  821. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-oro-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-oro-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-oro-1.8.0.pom left in tree.
  822. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-log4j.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-log4j.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-log4j.jar left in tree.
  823. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-log4j-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-log4j-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-log4j-1.8.0.pom.sha512 left in tree.
  824. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-log4j-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-log4j-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-log4j-1.8.0.pom.sha1 left in tree.
  825. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-log4j-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-log4j-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-log4j-1.8.0.pom.md5 left in tree.
  826. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-log4j-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-log4j-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-log4j-1.8.0.pom left in tree.
  827. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bsf.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bsf.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bsf.jar left in tree.
  828. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bsf-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bsf-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bsf-1.8.0.pom.sha512 left in tree.
  829. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bsf-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bsf-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bsf-1.8.0.pom.sha1 left in tree.
  830. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bsf-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bsf-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bsf-1.8.0.pom.md5 left in tree.
  831. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bsf-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bsf-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bsf-1.8.0.pom left in tree.
  832. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bcel.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bcel.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bcel.jar left in tree.
  833. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bcel-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bcel-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bcel-1.8.0.pom.sha512 left in tree.
  834. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bcel-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bcel-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bcel-1.8.0.pom.sha1 left in tree.
  835. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bcel-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bcel-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bcel-1.8.0.pom.md5 left in tree.
  836. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-apache-bcel-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-apache-bcel-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-apache-bcel-1.8.0.pom left in tree.
  837. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-antlr.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-antlr.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-antlr.jar left in tree.
  838. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-antlr-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-antlr-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-antlr-1.8.0.pom.sha512 left in tree.
  839. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-antlr-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-antlr-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-antlr-1.8.0.pom.sha1 left in tree.
  840. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-antlr-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-antlr-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-antlr-1.8.0.pom.md5 left in tree.
  841. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-antlr-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-antlr-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-antlr-1.8.0.pom left in tree.
  842. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-1.8.0.pom.sha512 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-1.8.0.pom.sha512 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-1.8.0.pom.sha512 left in tree.
  843. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-1.8.0.pom.sha1 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-1.8.0.pom.sha1 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-1.8.0.pom.sha1 left in tree.
  844. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-1.8.0.pom.md5 deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-1.8.0.pom.md5 in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-1.8.0.pom.md5 left in tree.
  845. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/ant-1.8.0.pom deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/ant-1.8.0.pom in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/ant-1.8.0.pom left in tree.
  846. CONFLICT (rename/delete): GeoSwitchover/template/ant/lib/README deleted in HEAD and renamed to GeoSwitchover/old/template/ant/lib/README in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/lib/README left in tree.
  847. CONFLICT (rename/delete): GeoSwitchover/template/ant/get-m2.xml deleted in HEAD and renamed to GeoSwitchover/old/template/ant/get-m2.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/get-m2.xml left in tree.
  848. CONFLICT (rename/delete): GeoSwitchover/template/ant/fetch.xml deleted in HEAD and renamed to GeoSwitchover/old/template/ant/fetch.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/fetch.xml left in tree.
  849. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/tagdiff.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/tagdiff.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/tagdiff.xsl left in tree.
  850. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/mmetrics-frames.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/mmetrics-frames.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/mmetrics-frames.xsl left in tree.
  851. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/maudit-frames.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/maudit-frames.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/maudit-frames.xsl left in tree.
  852. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/log.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/log.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/log.xsl left in tree.
  853. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/junit-noframes.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/junit-noframes.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/junit-noframes.xsl left in tree.
  854. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/junit-frames.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/junit-frames.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/junit-frames.xsl left in tree.
  855. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/junit-frames-xalan1.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/junit-frames-xalan1.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/junit-frames-xalan1.xsl left in tree.
  856. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/jdepend.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/jdepend.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/jdepend.xsl left in tree.
  857. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/jdepend-frames.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/jdepend-frames.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/jdepend-frames.xsl left in tree.
  858. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/coverage-frames.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/coverage-frames.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/coverage-frames.xsl left in tree.
  859. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/checkstyle/checkstyle-xdoc.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/checkstyle/checkstyle-xdoc.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/checkstyle/checkstyle-xdoc.xsl left in tree.
  860. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/checkstyle/checkstyle-text.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/checkstyle/checkstyle-text.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/checkstyle/checkstyle-text.xsl left in tree.
  861. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/checkstyle/checkstyle-frames.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/checkstyle/checkstyle-frames.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/checkstyle/checkstyle-frames.xsl left in tree.
  862. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/changelog.xsl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/changelog.xsl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/changelog.xsl left in tree.
  863. CONFLICT (rename/delete): GeoSwitchover/template/ant/etc/ant-bootstrap.jar deleted in HEAD and renamed to GeoSwitchover/old/template/ant/etc/ant-bootstrap.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/etc/ant-bootstrap.jar left in tree.
  864. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/runrc.cmd deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/runrc.cmd in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/runrc.cmd left in tree.
  865. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/runant.py deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/runant.py in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/runant.py left in tree.
  866. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/runant.pl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/runant.pl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/runant.pl left in tree.
  867. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/lcp.bat deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/lcp.bat in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/lcp.bat left in tree.
  868. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/envset.cmd deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/envset.cmd in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/envset.cmd left in tree.
  869. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/complete-ant-cmd.pl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/complete-ant-cmd.pl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/complete-ant-cmd.pl left in tree.
  870. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/antenv.cmd deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/antenv.cmd in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/antenv.cmd left in tree.
  871. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/antRun.pl deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/antRun.pl in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/antRun.pl left in tree.
  872. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/antRun.bat deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/antRun.bat in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/antRun.bat left in tree.
  873. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/antRun deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/antRun in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/antRun left in tree.
  874. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/ant.cmd deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/ant.cmd in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/ant.cmd left in tree.
  875. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/ant.bat deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/ant.bat in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/ant.bat left in tree.
  876. CONFLICT (rename/delete): GeoSwitchover/template/ant/bin/ant deleted in HEAD and renamed to GeoSwitchover/old/template/ant/bin/ant in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/bin/ant left in tree.
  877. CONFLICT (rename/delete): GeoSwitchover/template/ant/WHATSNEW deleted in HEAD and renamed to GeoSwitchover/old/template/ant/WHATSNEW in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/WHATSNEW left in tree.
  878. CONFLICT (rename/delete): GeoSwitchover/template/ant/README deleted in HEAD and renamed to GeoSwitchover/old/template/ant/README in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/README left in tree.
  879. CONFLICT (rename/delete): GeoSwitchover/template/ant/NOTICE deleted in HEAD and renamed to GeoSwitchover/old/template/ant/NOTICE in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/NOTICE left in tree.
  880. CONFLICT (rename/delete): GeoSwitchover/template/ant/LICENSE deleted in HEAD and renamed to GeoSwitchover/old/template/ant/LICENSE in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/LICENSE left in tree.
  881. CONFLICT (rename/delete): GeoSwitchover/template/ant/KEYS deleted in HEAD and renamed to GeoSwitchover/old/template/ant/KEYS in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/KEYS left in tree.
  882. CONFLICT (rename/delete): GeoSwitchover/template/ant/INSTALL deleted in HEAD and renamed to GeoSwitchover/old/template/ant/INSTALL in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/template/ant/INSTALL left in tree.
  883. CONFLICT (rename/delete): GeoSwitchover/switchover/switchover.properties deleted in HEAD and renamed to GeoSwitchover/old/switchover/switchover.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/switchover/switchover.properties left in tree.
  884. CONFLICT (rename/delete): GeoSwitchover/switchover/passive-to-active.sh deleted in HEAD and renamed to GeoSwitchover/old/switchover/passive-to-active.sh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/switchover/passive-to-active.sh left in tree.
  885. CONFLICT (rename/delete): GeoSwitchover/switchover/internal/update_ctds_config.sh deleted in HEAD and renamed to GeoSwitchover/old/switchover/internal/update_ctds_config.sh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/switchover/internal/update_ctds_config.sh left in tree.
  886. CONFLICT (rename/delete): GeoSwitchover/switchover/internal/switchover-update-ctds-config.xml deleted in HEAD and renamed to GeoSwitchover/old/switchover/internal/switchover-update-ctds-config.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/switchover/internal/switchover-update-ctds-config.xml left in tree.
  887. CONFLICT (rename/delete): GeoSwitchover/switchover/internal/mysql_slave_status.sh deleted in HEAD and renamed to GeoSwitchover/old/switchover/internal/mysql_slave_status.sh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/switchover/internal/mysql_slave_status.sh left in tree.
  888. CONFLICT (rename/delete): GeoSwitchover/switchover/internal/functions.sh deleted in HEAD and renamed to GeoSwitchover/old/switchover/internal/functions.sh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/switchover/internal/functions.sh left in tree.
  889. CONFLICT (rename/delete): GeoSwitchover/switchover/ctds.properties deleted in HEAD and renamed to GeoSwitchover/old/switchover/ctds.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/switchover/ctds.properties left in tree.
  890. CONFLICT (rename/delete): GeoSwitchover/switchover/active-to-passive.sh deleted in HEAD and renamed to GeoSwitchover/old/switchover/active-to-passive.sh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/switchover/active-to-passive.sh left in tree.
  891. CONFLICT (rename/delete): GeoSwitchover/installer/switchover-database.xml deleted in HEAD and renamed to GeoSwitchover/old/installer/switchover-database.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/switchover-database.xml left in tree.
  892. CONFLICT (rename/delete): GeoSwitchover/installer/switchover-config-validation.xml deleted in HEAD and renamed to GeoSwitchover/old/installer/switchover-config-validation.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/switchover-config-validation.xml left in tree.
  893. CONFLICT (rename/delete): GeoSwitchover/installer/sql/remove-users.sql deleted in HEAD and renamed to GeoSwitchover/old/installer/sql/remove-users.sql in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/sql/remove-users.sql left in tree.
  894. CONFLICT (rename/delete): GeoSwitchover/installer/sql/migrationScript.sql deleted in HEAD and renamed to GeoSwitchover/old/installer/sql/migrationScript.sql in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/sql/migrationScript.sql left in tree.
  895. CONFLICT (rename/delete): GeoSwitchover/installer/sql/db_users_tmpl.sql deleted in HEAD and renamed to GeoSwitchover/old/installer/sql/db_users_tmpl.sql in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/sql/db_users_tmpl.sql left in tree.
  896. CONFLICT (rename/delete): GeoSwitchover/installer/sql/create-database.sql deleted in HEAD and renamed to GeoSwitchover/old/installer/sql/create-database.sql in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/sql/create-database.sql left in tree.
  897. CONFLICT (rename/delete): GeoSwitchover/installer/sql/clean-database.sql deleted in HEAD and renamed to GeoSwitchover/old/installer/sql/clean-database.sql in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/sql/clean-database.sql left in tree.
  898. CONFLICT (rename/delete): GeoSwitchover/installer/reg-ep/setup_ds.xml deleted in HEAD and renamed to GeoSwitchover/old/installer/reg-ep/setup_ds.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/reg-ep/setup_ds.xml left in tree.
  899. CONFLICT (rename/delete): GeoSwitchover/installer/reg-ep/regUtils.jar deleted in HEAD and renamed to GeoSwitchover/old/installer/reg-ep/regUtils.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/reg-ep/regUtils.jar left in tree.
  900. CONFLICT (rename/delete): GeoSwitchover/installer/reg-ep/defaultEncryptionKey deleted in HEAD and renamed to GeoSwitchover/old/installer/reg-ep/defaultEncryptionKey in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/reg-ep/defaultEncryptionKey left in tree.
  901. CONFLICT (rename/delete): GeoSwitchover/installer/reg-ep/DSImporter.properties.template deleted in HEAD and renamed to GeoSwitchover/old/installer/reg-ep/DSImporter.properties.template in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/reg-ep/DSImporter.properties.template left in tree.
  902. CONFLICT (rename/delete): GeoSwitchover/installer/reg-ep/DSImporter.properties deleted in HEAD and renamed to GeoSwitchover/old/installer/reg-ep/DSImporter.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/reg-ep/DSImporter.properties left in tree.
  903. CONFLICT (rename/delete): GeoSwitchover/installer/process-deployer/jbpm.cfg.xml deleted in HEAD and renamed to GeoSwitchover/old/installer/process-deployer/jbpm.cfg.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/process-deployer/jbpm.cfg.xml left in tree.
  904. CONFLICT (rename/delete): GeoSwitchover/installer/process-deployer/hibernate.cfg.xml deleted in HEAD and renamed to GeoSwitchover/old/installer/process-deployer/hibernate.cfg.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/process-deployer/hibernate.cfg.xml left in tree.
  905. CONFLICT (rename/delete): GeoSwitchover/installer/process-deployer/hibernate-configuration-3.0.dtd deleted in HEAD and renamed to GeoSwitchover/old/installer/process-deployer/hibernate-configuration-3.0.dtd in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/process-deployer/hibernate-configuration-3.0.dtd left in tree.
  906. CONFLICT (rename/delete): GeoSwitchover/installer/lib/mysql-connector-java-5.1.27-bin.jar deleted in HEAD and renamed to GeoSwitchover/old/installer/lib/mysql-connector-java-5.1.27-bin.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/lib/mysql-connector-java-5.1.27-bin.jar left in tree.
  907. CONFLICT (rename/delete): GeoSwitchover/installer/installer-config-acquiration.xml deleted in HEAD and renamed to GeoSwitchover/old/installer/installer-config-acquiration.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/installer-config-acquiration.xml left in tree.
  908. CONFLICT (rename/delete): GeoSwitchover/installer/installer-archiver.xml deleted in HEAD and renamed to GeoSwitchover/old/installer/installer-archiver.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/installer-archiver.xml left in tree.
  909. CONFLICT (rename/delete): GeoSwitchover/installer/db-tools/db-deployer.jar deleted in HEAD and renamed to GeoSwitchover/old/installer/db-tools/db-deployer.jar in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/db-tools/db-deployer.jar left in tree.
  910. CONFLICT (rename/delete): GeoSwitchover/installer/configure-switchover-installer.xml deleted in HEAD and renamed to GeoSwitchover/old/installer/configure-switchover-installer.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/configure-switchover-installer.xml left in tree.
  911. CONFLICT (rename/delete): GeoSwitchover/installer/bin/grant_db_privileges_switchover.sh deleted in HEAD and renamed to GeoSwitchover/old/installer/bin/grant_db_privileges_switchover.sh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/bin/grant_db_privileges_switchover.sh left in tree.
  912. CONFLICT (rename/delete): GeoSwitchover/installer/bin/@common.sh deleted in HEAD and renamed to GeoSwitchover/old/installer/bin/@common.sh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer/bin/@common.sh left in tree.
  913. CONFLICT (rename/delete): GeoSwitchover/installer.properties deleted in HEAD and renamed to GeoSwitchover/old/installer.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/installer.properties left in tree.
  914. CONFLICT (rename/delete): GeoSwitchover/configuration/internal.properties deleted in HEAD and renamed to GeoSwitchover/old/configuration/internal.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/configuration/internal.properties left in tree.
  915. CONFLICT (rename/delete): GeoSwitchover/configuration/id_rsa.pub deleted in HEAD and renamed to GeoSwitchover/old/configuration/id_rsa.pub in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/configuration/id_rsa.pub left in tree.
  916. CONFLICT (rename/delete): GeoSwitchover/configuration/id_rsa.key deleted in HEAD and renamed to GeoSwitchover/old/configuration/id_rsa.key in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/configuration/id_rsa.key left in tree.
  917. CONFLICT (rename/delete): GeoSwitchover/configuration/ctds_module.properties deleted in HEAD and renamed to GeoSwitchover/old/configuration/ctds_module.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/configuration/ctds_module.properties left in tree.
  918. CONFLICT (rename/delete): GeoSwitchover/configuration/connectionTestSchemaList.xml deleted in HEAD and renamed to GeoSwitchover/old/configuration/connectionTestSchemaList.xml in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/configuration/connectionTestSchemaList.xml left in tree.
  919. CONFLICT (rename/delete): GeoSwitchover/configuration/clb_module.properties deleted in HEAD and renamed to GeoSwitchover/old/configuration/clb_module.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/configuration/clb_module.properties left in tree.
  920. CONFLICT (rename/delete): GeoSwitchover/configuration/all_module.properties deleted in HEAD and renamed to GeoSwitchover/old/configuration/all_module.properties in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/configuration/all_module.properties left in tree.
  921. CONFLICT (rename/delete): GeoSwitchover/@upgrade-acquire-configuration.sh deleted in HEAD and renamed to GeoSwitchover/old/@upgrade-acquire-configuration.sh in GeoSwitchover-devel. Version GeoSwitchover-devel of GeoSwitchover/old/@upgrade-acquire-configuration.sh left in tree.
  922. Automatic merge failed; fix conflicts and then commit the result.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!