From 5ce807943fab2ba233cff661e34e4d6a83397b99 Mon Sep 17 00:00:00 2001
From: Mario Mulansky <mario.mulansky@gmx.net>
Date: Mon, 13 Oct 2014 11:03:42 +0200
Subject: changed to BSD license

---
 examples/merge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/merge.py')

diff --git a/examples/merge.py b/examples/merge.py
index 726d32b..2550cdb 100644
--- a/examples/merge.py
+++ b/examples/merge.py
@@ -4,7 +4,7 @@ Simple example showing the merging of two spike trains.
 
 Copyright 2014, Mario Mulansky <mario.mulansky@gmx.net>
 
-Distributed under the MIT License (MIT)
+Distributed under the BSD License
 """
 
 from __future__ import print_function
-- 
cgit v1.2.3