From fe28064e10cebfb74d20cf8cf604bd772c725301 Mon Sep 17 00:00:00 2001 From: Sebastian Seedorf Date: Tue, 30 May 2017 09:39:56 +0200 Subject: [PATCH] Merging completed --- .idea/typescript-compiler.xml | 2 + .idea/workspace.xml | 717 ++++++------------ .../inputs/dropdown-input.component.ts | 5 +- .../dyn-form/services/question.service.ts | 38 +- 4 files changed, 279 insertions(+), 483 deletions(-) diff --git a/.idea/typescript-compiler.xml b/.idea/typescript-compiler.xml index 17ff836..778bac5 100644 --- a/.idea/typescript-compiler.xml +++ b/.idea/typescript-compiler.xml @@ -2,6 +2,8 @@ \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e84326a..0bd0570 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,19 +1,11 @@ - - - - + + - - - - - - - - + + @@ -27,80 +19,102 @@ - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - $PROJECT_DIR$ - - - + + + true DEFINITION_ORDER @@ -109,12 +123,11 @@ - - @@ -130,8 +143,6 @@ - - @@ -176,6 +187,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + @@ -344,12 +394,6 @@ - project - - - - - @@ -372,103 +416,53 @@ false - - - - -