Permalink
Browse files

removed app.config conflicts, and some other debug code

  • Loading branch information...
NickJosevski committed Jan 16, 2012
1 parent 98ea3b5 commit 2acfa2abddbc90f654ef7df2b641726f0c1c940f
Showing with 2 additions and 11 deletions.
  1. +0 −2 Jabbot.ConsoleBotHost/Program.cs
  2. +2 −9 Jabbot.ConsoleBotHost/app.config
@@ -50,8 +50,6 @@ private static void RunBot()
var users = bot.GetUsers(bot.Rooms.First());
var user = bot.GetUserInfo(bot.Rooms.First(), users.First().Name.ToString());
- bot.Say("Up and running...", "Code52-testing4");
-
scheduler.Start(announcements, bot);
Console.Write("Press enter to quit...");
@@ -1,18 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<appSettings>
-<<<<<<< HEAD
- <add key="Bot.Name" value="NicksBot" />
- <add key="Bot.Password" value="donthackme" />
- <add key="Bot.Server" value="http://jabbr.net" />
- <add key="Bot.RoomList" value="Code52-testing4" />
- <add key="Application.Gravatar" value="nickjosevski@gmail.com" />
-=======
<add key="Bot.Name" value="jibbr-quiz" />
<add key="Bot.Password" value="somepassword" />
<add key="Bot.Server" value="http://jabbr.net" />
- <add key="Bot.RoomList" value="Code52-testing4" />
- <add key="Application.Gravatar" value="nickjosevski@gmail.com" />
+ <add key="Bot.RoomList" value="Code52-testing" />
+ <add key="Application.Gravatar" value="cyberzed@sleddog.dk" />
<add key="Twitter.ConsumerKey" value="i8M47S9wTNCDIo7FtCLcsg" />
<add key="Twitter.ConsumerSecret" value="i8M47S9wTNCDIo7FtCLgHsYpjIKZf9Xcuy7khLyWhvnt7NPjJ8S8CBQ6lKwXscsg" />
<add key="Twitter.Token" value="130116760-iZ2teqS3wxq2j3Nr69KOiAtye1NRWR6ZTvQ0UYv5" />

0 comments on commit 2acfa2a

Please sign in to comment.