Home Explore Help
Sign In
vigdis
/
bot-irc
0
0
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

oups, il manquait un bout

Vigdis (DanJ) 10 years ago
parent
31c3fde92b
commit
1dbbf76b75
1 changed files with 0 additions and 4 deletions
Unified View Show Diff Stats
  1. 0 4
      unefede.pl

+ 0 - 4
unefede.pl
View File 

@@ -362,10 +362,6 @@ sub said {
 
 	}
 
 	}
 
 	# sdn
 
 	# sdn
 
 	elsif($message->{body} =~ /$regex{"sdn"}/i) {
 
 	elsif($message->{body} =~ /$regex{"sdn"}/i) {
 
-<<<<<<< HEAD
 
-#	    return"Sallanches Data Network = siteweb : http://sdnet.adh/ ; pas de salon ; à Sallanches (73)";
 
-=======
 
->>>>>>> e1e4ba39a66a7e535beea14fba6ec9c7ec75ef60
 
 	    adh("sdn");
 
 	    adh("sdn");
 
 	}
 
 	}
 
 	# teleragno
 
 	# teleragno