merge-recursive: Add copyright notice
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
46e651743a
commit
857f26d2f4
@ -1,4 +1,7 @@
|
||||
#!/usr/bin/python
|
||||
#
|
||||
# Copyright (C) 2005 Fredrik Kuivinen
|
||||
#
|
||||
|
||||
import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
|
||||
from heapq import heappush, heappop
|
||||
|
@ -1,3 +1,7 @@
|
||||
#
|
||||
# Copyright (C) 2005 Fredrik Kuivinen
|
||||
#
|
||||
|
||||
import sys, re, os, traceback
|
||||
from sets import Set
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user