Projects >> ManalithBot >>ebaca745bf08f3e5f60749a1198638c3086c5e73

Chunk
Conflicting content 
		bot.setEncoding(config.getServerEncoding());
		bot.connect(config.getServer(), config.getServerPort());

<<<<<<< HEAD
		//bot.addPlugin(new org.manalith.ircbot.plugin.fdbot.fdbotPlugin(bot));
		//bot.addPlugin(new org.manalith.ircbot.plugin.weather.WeatherPlugin(bot));
		bot.addPlugin(new org.manalith.ircbot.plugin.waitbdbot.WaitBDBotPlugin(bot));
=======
		// bot.addPlugin(new org.manalith.ircbot.plugin.fdbot.fdbotPlugin(bot));
		//bot.addPlugin(new org.manalith.ircbot.plugin.waitbdbot.WaitBDBotPlugin(bot));
>>>>>>> 56bd3ef48154e3f2d802b680fe19decacbd99864
		bot.addPlugin(new org.manalith.ircbot.plugin.twitreader.TwitReaderPlugin(bot));
		//bot.addPlugin(new org.manalith.ircbot.plugin.nvidiadrivernews.NvidiaDriverNewsPlugin(bot));
		//bot.addPlugin(new org.manalith.ircbot.plugin.missedmessage.MissedMessagePlugin(bot));
Solution content 
		bot.setEncoding(config.getServerEncoding());
		bot.connect(config.getServer(), config.getServerPort());

<<<<<<< HEAD
		//bot.addPlugin(new org.manalith.ircbot.plugin.fdbot.fdbotPlugin(bot));
		//bot.addPlugin(new org.manalith.ircbot.plugin.weather.WeatherPlugin(bot));
		bot.addPlugin(new org.manalith.ircbot.plugin.waitbdbot.WaitBDBotPlugin(bot));
=======
		// bot.addPlugin(new org.manalith.ircbot.plugin.fdbot.fdbotPlugin(bot));
		//bot.addPlugin(new org.manalith.ircbot.plugin.waitbdbot.WaitBDBotPlugin(bot));
>>>>>>> 56bd3ef48154e3f2d802b680fe19decacbd99864
		bot.addPlugin(new org.manalith.ircbot.plugin.twitreader.TwitReaderPlugin(bot));
		//bot.addPlugin(new org.manalith.ircbot.plugin.nvidiadrivernews.NvidiaDriverNewsPlugin(bot));
		//bot.addPlugin(new org.manalith.ircbot.plugin.missedmessage.MissedMessagePlugin(bot));
File
BotMain.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation