From 397abc04b42655e4befff50db5c3fadf8e452a71 Mon Sep 17 00:00:00 2001
From: "m.schrenker" <m.schrenker@thalia.de>
Date: Tue, 26 Mar 2019 13:07:29 +0100
Subject: [PATCH 1/2] project update for code review test

---
 .idea/codeStyles/Project.xml | 29 +++++++++++++++++++++++++
 .idea/modules.xml            |  1 +
 .idea/vcs.xml                |  6 ++++++
 app/build.gradle             | 42 ++++++++++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 4cfcb7d..c2a1f39 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Chrislizh-SpinnerTwoWayDataBindingDemo-master.iml" filepath="$PROJECT_DIR$/Chrislizh-SpinnerTwoWayDataBindingDemo-master.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/SO_Question_SpinnerDataBindingBaseAdapter.iml" filepath="$PROJECT_DIR$/.idea/SO_Question_SpinnerDataBindingBaseAdapter.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 06c4fde..f2ce377 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,6 +23,8 @@ android {
     }
 }
 
+// Test änderung
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
@@ -31,3 +33,43 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     testCompile 'junit:junit:4.12'
 }
+
+
+
+
+
+
+
+
+
+
+
+// andere lange nänderung
+
+
+// andere lange nänderung
+
+
+// andere lange nänderung
+
+
+
+// andere lange nänderung
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// andere lange nänderung 300
\ No newline at end of file

From 9f59ca61da0e146cd132b78cf89cf847f99968c8 Mon Sep 17 00:00:00 2001
From: "m.schrenker" <m.schrenker@thalia.de>
Date: Tue, 26 Mar 2019 13:09:24 +0100
Subject: [PATCH 2/2] Test merge requst for review

---
 app/build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f2ce377..fe751bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.application'
 
+// Bolle
+
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
@@ -23,7 +25,7 @@ android {
     }
 }
 
-// Test änderung
+// Test änderung 2
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
@@ -72,4 +74,4 @@ dependencies {
 
 
 
-// andere lange nänderung 300
\ No newline at end of file
+// andere lange nänderung 300 2
\ No newline at end of file