From 75caebc1783e6ef70f67da07c56b9d7cbb9e1733 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 18 Apr 2016 03:45:03 -0700 Subject: Use mock connection as default --- .gitignore | 3 +++ mavigator-uav/src/main/resources/reference.conf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5133a17..3c4fa77 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ project/plugins/project/ .classpath .cache +# akka application configuration (use reference.conf instead) +application.conf + # ensime .ensime .ensime_cache/ diff --git a/mavigator-uav/src/main/resources/reference.conf b/mavigator-uav/src/main/resources/reference.conf index 5e66de3..282df90 100644 --- a/mavigator-uav/src/main/resources/reference.conf +++ b/mavigator-uav/src/main/resources/reference.conf @@ -3,7 +3,7 @@ mavigator.uav { # The type of connection to use # 'mock' or 'serial' - type = serial + type = mock # Settings related to serial connections serial { -- cgit v1.2.3