merge conflict

chee · Mar 29, 2016 · 6025bae · 6025bae
1 parent c856824
commit 6025bae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bot.py b/bot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import irc.bot
 import os

diff --git a/conf/channel b/conf/channel
@@ -1 +1 @@
-##test
+#snaek
diff --git a/conf/name b/conf/name
@@ -1 +1 @@
-botpy
+petal