merge resolve

4342b835 · Luise Odenthal · 9e3c61bf · 9e3c61bf · 4342b835 · 4342b835
Commit 4342b835 authored 7 years ago by Luise Odenthal
--- a/doc/build/html/example/database/load_image_rowid.png
+++ b/doc/build/html/example/database/load_image_rowid.png
--- a/doc/build/html/example/database/load_image_rowid.py
+++ b/doc/build/html/example/database/load_image_rowid.py
 import numpy as np
 import matplotlib.pyplot as plt
-<<<<<<< HEAD
-from database import DataBaseLoad
-=======
 from navipy.database import DataBaseLoad
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
 import os

--- a/doc/build/html/example/processing/apcv.hires.png
+++ b/doc/build/html/example/processing/apcv.hires.png
--- a/doc/build/html/example/processing/apcv.pdf
+++ b/doc/build/html/example/processing/apcv.pdf
--- a/doc/build/html/example/processing/apcv.png
+++ b/doc/build/html/example/processing/apcv.png
--- a/doc/build/html/example/processing/apcv.py
+++ b/doc/build/html/example/processing/apcv.py
 import matplotlib.pyplot as plt
-<<<<<<< HEAD
-from database import DataBaseLoad
-import processing
-=======
 from navipy.database import DataBaseLoad
 import navipy.processing as processing
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
 import os
 import numpy as np

--- a/doc/build/html/example/processing/contrast_weighted_nearness.hires.png
+++ b/doc/build/html/example/processing/contrast_weighted_nearness.hires.png
--- a/doc/build/html/example/processing/contrast_weighted_nearness.pdf
+++ b/doc/build/html/example/processing/contrast_weighted_nearness.pdf
--- a/doc/build/html/example/processing/contrast_weighted_nearness.png
+++ b/doc/build/html/example/processing/contrast_weighted_nearness.png
--- a/doc/build/html/example/processing/contrast_weighted_nearness.py
+++ b/doc/build/html/example/processing/contrast_weighted_nearness.py
 import matplotlib.pyplot as plt
-<<<<<<< HEAD
-from database import DataBaseLoad
-import processing
-=======
 from navipy.database import DataBaseLoad
 import navipy.processing as processing
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
 import os

--- a/doc/build/html/example/processing/michelson_contrast.hires.png
+++ b/doc/build/html/example/processing/michelson_contrast.hires.png
--- a/doc/build/html/example/processing/michelson_contrast.pdf
+++ b/doc/build/html/example/processing/michelson_contrast.pdf
--- a/doc/build/html/example/processing/michelson_contrast.png
+++ b/doc/build/html/example/processing/michelson_contrast.png
--- a/doc/build/html/example/processing/michelson_contrast.py
+++ b/doc/build/html/example/processing/michelson_contrast.py
 import matplotlib.pyplot as plt
-<<<<<<< HEAD
-from database import DataBaseLoad
-import processing
-=======
 from navipy.database import DataBaseLoad
 import navipy.processing as processing
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
 import os

--- a/doc/build/html/example/processing/pcv.py
+++ b/doc/build/html/example/processing/pcv.py
 # import matplotlib.pyplot as plt
-<<<<<<< HEAD
-from database import DataBaseLoad
-import processing
-=======
 from navipy.database import DataBaseLoad
 import navipy.processing as processing
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
 import os

--- a/doc/build/html/example/processing/scene.hires.png
+++ b/doc/build/html/example/processing/scene.hires.png
--- a/doc/build/html/example/processing/scene.pdf
+++ b/doc/build/html/example/processing/scene.pdf
--- a/doc/build/html/example/processing/scene.png
+++ b/doc/build/html/example/processing/scene.png
--- a/doc/build/html/example/processing/scene.py
+++ b/doc/build/html/example/processing/scene.py
 import numpy as np
 import matplotlib.pyplot as plt
-<<<<<<< HEAD
-from database import DataBaseLoad
-import processing
-=======
 from navipy.database import DataBaseLoad
 import navipy.processing as processing
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
 import os

--- a/doc/build/html/example/processing/skyline.hires.png
+++ b/doc/build/html/example/processing/skyline.hires.png