From f17b9940e995d42ceab71d994df1619e7afacc26 Mon Sep 17 00:00:00 2001
From: Silvia <silvia.roennau@gmx.de>
Date: Tue, 9 Oct 2018 10:43:26 +0200
Subject: [PATCH] Merge

---
 doc/source/conf.py                                                | 0
 .../Lobecke_JEB_2018/Y101_OBFlight_0001_side.tra                  | 0
 .../sample_experiment/Lobecke_JEB_2018/Y101_OBFlight_0001_top.tra | 0
 .../sample_experiment/Lobecke_JEB_2018/fullcalib_fromtra.xml      | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 doc/source/conf.py
 mode change 100755 => 100644 navipy/resources/sample_experiment/Lobecke_JEB_2018/Y101_OBFlight_0001_side.tra
 mode change 100755 => 100644 navipy/resources/sample_experiment/Lobecke_JEB_2018/Y101_OBFlight_0001_top.tra
 mode change 100755 => 100644 navipy/resources/sample_experiment/Lobecke_JEB_2018/fullcalib_fromtra.xml

diff --git a/doc/source/conf.py b/doc/source/conf.py
old mode 100755
new mode 100644
diff --git a/navipy/resources/sample_experiment/Lobecke_JEB_2018/Y101_OBFlight_0001_side.tra b/navipy/resources/sample_experiment/Lobecke_JEB_2018/Y101_OBFlight_0001_side.tra
old mode 100755
new mode 100644
diff --git a/navipy/resources/sample_experiment/Lobecke_JEB_2018/Y101_OBFlight_0001_top.tra b/navipy/resources/sample_experiment/Lobecke_JEB_2018/Y101_OBFlight_0001_top.tra
old mode 100755
new mode 100644
diff --git a/navipy/resources/sample_experiment/Lobecke_JEB_2018/fullcalib_fromtra.xml b/navipy/resources/sample_experiment/Lobecke_JEB_2018/fullcalib_fromtra.xml
old mode 100755
new mode 100644
-- 
GitLab