diff options
| author | Michael Elkins <melkins@tislabs.com> | 2014-04-07 17:38:40 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2014-04-07 17:38:40 +0000 |
| commit | 1a1c9b672049f1e6836bbccd96fe1734cc791456 (patch) | |
| tree | a1e2c0b8336a7ffa267261fc184c64f666ec01ea /rpkid/rpki/resource_set.py | |
| parent | b403f46676c6dcde856f3a943361f08c2a6fe5f3 (diff) | |
| parent | aa28ef54c271fbe4d52860ff8cf13cab19e2207c (diff) | |
merge with ^/trunk
svn path=/branches/tk674/; revision=5761
Diffstat (limited to 'rpkid/rpki/resource_set.py')
| -rw-r--r-- | rpkid/rpki/resource_set.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/rpkid/rpki/resource_set.py b/rpkid/rpki/resource_set.py index f78d37fd..2ec19cab 100644 --- a/rpkid/rpki/resource_set.py +++ b/rpkid/rpki/resource_set.py @@ -30,7 +30,6 @@ We also provide some basic set operations (union, intersection, etc). import re import math -import rpki.oids import rpki.exceptions import rpki.POW |