Merge

2010-09-29 10:07:33 +02:00
parent 2cff95559b bebd74ffc0
commit e9248114a7
6 changed files with 31 additions and 13 deletions
--- a/4
+++ b/4
@@ -1,4 +1,8 @@
+<<<<<<< HEAD:Makefile
 include $(GOROOT)/src/Make.inc
+=======
+include $(GOROOT)/src/Make.${GOARCH}
+>>>>>>> 6f3c572eae2c00aaaf57248b767adf74b571ed01:Makefile

 TARG=irc
 GOFILES=irc.go irc_struct.go irc_callback.go