search

Ueland / VikingBot

Vikingbot is yet another simple PHP based IRC bot with support for plugins and secure IRC servers. The bot requires Unix/Linux shell access with PHP support and SSL support in PHP for use against secure IRC servers.
GNU General Public License v3.0
39 stars 6 forks source link

Merge both config files to avoid missing settings after an upgrade #21

Closed hashworks closed 9 years ago

hashworks commented 9 years ago

This should resolve #2 - your decision.

Ueland commented 9 years ago

Looks good to me! But this has also triggered a conflict, want to check it out? :)

Ueland commented 9 years ago

(if not, i can take a look when time allows it)

hashworks commented 9 years ago

This should do :)

Ueland commented 9 years ago

Looks like one of your other merges caused conflicts here again.

hashworks commented 9 years ago

There you go.

Ueland commented 9 years ago

I always end up checking this last, and then new conflicts has arrived, now again ;)

hashworks commented 9 years ago

Ups, I deleted it accidentally. Continue in #29.