merge resolve

4342b835 · Luise Odenthal · 9e3c61bf · 4342b835 · 4342b835 · 4342b835
Commit 4342b835 authored 7 years ago by Luise Odenthal
--- a/doc/build/doctrees/analysing.doctree
+++ b/doc/build/doctrees/analysing.doctree
--- a/doc/build/doctrees/comparing.doctree
+++ b/doc/build/doctrees/comparing.doctree
--- a/doc/build/doctrees/computing.doctree
+++ b/doc/build/doctrees/computing.doctree
--- a/doc/build/doctrees/database.doctree
+++ b/doc/build/doctrees/database.doctree
--- a/doc/build/doctrees/environment.pickle
+++ b/doc/build/doctrees/environment.pickle
--- a/doc/build/doctrees/gettingstarted.doctree
+++ b/doc/build/doctrees/gettingstarted.doctree
--- a/doc/build/doctrees/index.doctree
+++ b/doc/build/doctrees/index.doctree
--- a/doc/build/doctrees/moving.doctree
+++ b/doc/build/doctrees/moving.doctree
--- a/doc/build/doctrees/processing.doctree
+++ b/doc/build/doctrees/processing.doctree
--- a/doc/build/doctrees/rendering.doctree
+++ b/doc/build/doctrees/rendering.doctree
--- a/doc/build/html/.buildinfo
+++ b/doc/build/html/.buildinfo
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-<<<<<<< HEAD
-config: 7f2c9a031c209e5385ba1222f3149fc4
-=======
 config: d55aeb7a84c31da790ac20b6aed3af14
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/doc/build/html/_images/apcv.png
+++ b/doc/build/html/_images/apcv.png
--- a/doc/build/html/_images/contrast_weighted_nearness.png
+++ b/doc/build/html/_images/contrast_weighted_nearness.png
--- a/doc/build/html/_images/load_image_posorient.png
+++ b/doc/build/html/_images/load_image_posorient.png
--- a/doc/build/html/_images/load_image_rowid.png
+++ b/doc/build/html/_images/load_image_rowid.png
--- a/doc/build/html/_images/michelson_contrast.png
+++ b/doc/build/html/_images/michelson_contrast.png
--- a/doc/build/html/_images/scene.png
+++ b/doc/build/html/_images/scene.png
--- a/doc/build/html/_images/skyline.png
+++ b/doc/build/html/_images/skyline.png
--- a/doc/build/html/_modules/index.html
+++ b/doc/build/html/_modules/index.html
-<<<<<<< HEAD
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Overview: module code &#8212; Navigation Toolbox a0 documentation</title>
-    <link rel="stylesheet" href="../_static/alabaster.css" type="text/css" />
-    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
-=======
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -23,7 +8,6 @@
    <title>Overview: module code &#8212; Navigation Toolbox a0 documentation</title>
    <link rel="stylesheet" href="../_static/alabaster.css" type="text/css" />
    <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '../',
@@ -37,28 +21,17 @@
    <script type="text/javascript" src="../_static/jquery.js"></script>
    <script type="text/javascript" src="../_static/underscore.js"></script>
    <script type="text/javascript" src="../_static/doctools.js"></script>
-<<<<<<< HEAD
-    <script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-=======
    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
    <link rel="index" title="Index" href="../genindex.html" />
    <link rel="search" title="Search" href="../search.html" />
  <link rel="stylesheet" href="../_static/custom.css" type="text/css" />
-<<<<<<< HEAD
-  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
-  </head>
-  <body role="document">
-=======
  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
  </head>
  <body>
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
    <div class="document">
@@ -67,11 +40,7 @@
          <div class="body" role="main">
  <h1>All modules for which code is available</h1>
-<<<<<<< HEAD
-<ul><li><a href="processing.html">processing</a></li>
-=======
 <ul><li><a href="navipy/processing.html">navipy.processing</a></li>
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
 </ul>
          </div>
@@ -103,13 +72,8 @@
      &copy;2017, Olivier J.N. Bertrand.
      |
-<<<<<<< HEAD
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 1.5.3</a>
-      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.8</a>
-=======
      Powered by <a href="http://sphinx-doc.org/">Sphinx 1.6.5</a>
      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.10</a>
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529
    </div>

--- a/doc/build/html/_sources/database.rst.txt
+++ b/doc/build/html/_sources/database.rst.txt
 Database
 ========
-<<<<<<< HEAD
-.. automodule:: database
-=======
 .. automodule:: navipy.database
->>>>>>> a85c0cc1d498234a17941f8c483c69983b367529