From 3604cd5d5c536e0044fd72198801380343c5d724 Mon Sep 17 00:00:00 2001
From: Shakeel Mohamed <smohamed@splunk.com>
Date: Mon, 25 Feb 2019 18:51:44 -0800
Subject: [PATCH] Remove merge local .conf to default in twitted example

---
 examples/twitted/twitted/default/app.conf                     | 2 +-
 examples/twitted/twitted/{local => default}/commands.conf     | 0
 examples/twitted/twitted/{local => default}/indexes.conf      | 0
 examples/twitted/twitted/{local => default}/inputs.conf       | 0
 examples/twitted/twitted/{local => default}/props.conf        | 0
 .../twitted/twitted/{local => default}/savedsearches.conf     | 0
 examples/twitted/twitted/{local => default}/transforms.conf   | 0
 examples/twitted/twitted/{local => default}/viewstates.conf   | 0
 examples/twitted/twitted/local/app.conf                       | 4 ----
 9 files changed, 1 insertion(+), 5 deletions(-)
 rename examples/twitted/twitted/{local => default}/commands.conf (100%)
 rename examples/twitted/twitted/{local => default}/indexes.conf (100%)
 rename examples/twitted/twitted/{local => default}/inputs.conf (100%)
 rename examples/twitted/twitted/{local => default}/props.conf (100%)
 rename examples/twitted/twitted/{local => default}/savedsearches.conf (100%)
 rename examples/twitted/twitted/{local => default}/transforms.conf (100%)
 rename examples/twitted/twitted/{local => default}/viewstates.conf (100%)
 delete mode 100644 examples/twitted/twitted/local/app.conf

diff --git a/examples/twitted/twitted/default/app.conf b/examples/twitted/twitted/default/app.conf
index f2371ba0c..4b55cee8d 100644
--- a/examples/twitted/twitted/default/app.conf
+++ b/examples/twitted/twitted/default/app.conf
@@ -9,5 +9,5 @@ label = twitted
 [launcher]
 author = 
 description = 
-version = 1.0
+version = 1.2
 
diff --git a/examples/twitted/twitted/local/commands.conf b/examples/twitted/twitted/default/commands.conf
similarity index 100%
rename from examples/twitted/twitted/local/commands.conf
rename to examples/twitted/twitted/default/commands.conf
diff --git a/examples/twitted/twitted/local/indexes.conf b/examples/twitted/twitted/default/indexes.conf
similarity index 100%
rename from examples/twitted/twitted/local/indexes.conf
rename to examples/twitted/twitted/default/indexes.conf
diff --git a/examples/twitted/twitted/local/inputs.conf b/examples/twitted/twitted/default/inputs.conf
similarity index 100%
rename from examples/twitted/twitted/local/inputs.conf
rename to examples/twitted/twitted/default/inputs.conf
diff --git a/examples/twitted/twitted/local/props.conf b/examples/twitted/twitted/default/props.conf
similarity index 100%
rename from examples/twitted/twitted/local/props.conf
rename to examples/twitted/twitted/default/props.conf
diff --git a/examples/twitted/twitted/local/savedsearches.conf b/examples/twitted/twitted/default/savedsearches.conf
similarity index 100%
rename from examples/twitted/twitted/local/savedsearches.conf
rename to examples/twitted/twitted/default/savedsearches.conf
diff --git a/examples/twitted/twitted/local/transforms.conf b/examples/twitted/twitted/default/transforms.conf
similarity index 100%
rename from examples/twitted/twitted/local/transforms.conf
rename to examples/twitted/twitted/default/transforms.conf
diff --git a/examples/twitted/twitted/local/viewstates.conf b/examples/twitted/twitted/default/viewstates.conf
similarity index 100%
rename from examples/twitted/twitted/local/viewstates.conf
rename to examples/twitted/twitted/default/viewstates.conf
diff --git a/examples/twitted/twitted/local/app.conf b/examples/twitted/twitted/local/app.conf
deleted file mode 100644
index 30970983e..000000000
--- a/examples/twitted/twitted/local/app.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[ui]
-
-[launcher]
-version = 1.2