summaryrefslogtreecommitdiff
path: root/PKG-INFO
diff options
context:
space:
mode:
authormanojgudi2013-10-14 12:53:18 +0530
committermanojgudi2013-10-14 12:53:18 +0530
commit1b865e2058eae46e4619ce9117f8e0da918fe467 (patch)
tree666dc7dd3d5249929dfa1d75521fed33f57765f4 /PKG-INFO
parent3eb54dce6db2c7d83ff593b5cd514708ed8231eb (diff)
parent937270f396cdda860081bf65cfe023da03d397ed (diff)
downloadsciscipy-1.0.0-1b865e2058eae46e4619ce9117f8e0da918fe467.tar.gz
sciscipy-1.0.0-1b865e2058eae46e4619ce9117f8e0da918fe467.tar.bz2
sciscipy-1.0.0-1b865e2058eae46e4619ce9117f8e0da918fe467.zip
resolved merge conflict
Diffstat (limited to 'PKG-INFO')
0 files changed, 0 insertions, 0 deletions