Fix merging

This commit is contained in:
NotMyFault
2019-09-08 20:02:45 +02:00
parent fe730574c9
commit 04f789d404
89 changed files with 854 additions and 823 deletions

2
gradlew.bat vendored
View File

@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,