diff --git a/astron/config/clientagent-0.yml b/astron/config/clientagent-0.yml index 3eb32408..fab5d392 100644 --- a/astron/config/clientagent-0.yml +++ b/astron/config/clientagent-0.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-0.yml.rej b/astron/config/clientagent-0.yml.rej deleted file mode 100644 index 2224c9f9..00000000 --- a/astron/config/clientagent-0.yml.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/astron/config/clientagent-0.yml b/astron/config/clientagent-0.yml (rejected hunks) -@@ -8,10 +8,6 @@ - - ../dclass/toon.dc - - uberdogs: -- - class: CentralLogger -- id: 4688 -- anonymous: false -- - - class: ClientServicesManager - id: 4665 - anonymous: true diff --git a/astron/config/clientagent-1.yml b/astron/config/clientagent-1.yml index f1a15803..b3c70b0c 100644 --- a/astron/config/clientagent-1.yml +++ b/astron/config/clientagent-1.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-2.yml b/astron/config/clientagent-2.yml index 5aa06124..df23b6d8 100644 --- a/astron/config/clientagent-2.yml +++ b/astron/config/clientagent-2.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-3.yml b/astron/config/clientagent-3.yml index fff8afbc..811837e2 100644 --- a/astron/config/clientagent-3.yml +++ b/astron/config/clientagent-3.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-4.yml b/astron/config/clientagent-4.yml index ddea5de7..b99a122a 100644 --- a/astron/config/clientagent-4.yml +++ b/astron/config/clientagent-4.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-5.yml b/astron/config/clientagent-5.yml index 041eff3d..ef034083 100644 --- a/astron/config/clientagent-5.yml +++ b/astron/config/clientagent-5.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-6.yml b/astron/config/clientagent-6.yml index d5e7f4ca..2bcb2f3f 100644 --- a/astron/config/clientagent-6.yml +++ b/astron/config/clientagent-6.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-7.yml b/astron/config/clientagent-7.yml index 4aca58ca..ca93110b 100644 --- a/astron/config/clientagent-7.yml +++ b/astron/config/clientagent-7.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/cluster.yml b/astron/config/cluster.yml index c9e951bb..41b8d948 100644 --- a/astron/config/cluster.yml +++ b/astron/config/cluster.yml @@ -10,10 +10,6 @@ messagedirector: bind: 127.0.0.1:7100 uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/dclass/united.dc.rej b/astron/dclass/united.dc.rej deleted file mode 100644 index 17ddee61..00000000 --- a/astron/dclass/united.dc.rej +++ /dev/null @@ -1,14 +0,0 @@ -diff a/astron/dclass/united.dc b/astron/dclass/united.dc (rejected hunks) -@@ -13,12 +13,9 @@ - from otp.friends import GuildManager/AI/UD - from otp.friends import FriendInfo - from otp.friends import AvatarFriendInfo --from otp.distributed import ObjectServer/AI/UD - from otp.distributed import DistributedDistrict/AI/UD - from otp.distributed import DistributedDirectory/AI --from otp.distributed import DistributedTestObject/AI - from otp.chat import ChatAgent/UD --from otp.distributed import CentralLogger/AI/UD - from otp.avatar import AvatarHandle - - typedef uint8 bool;