Merge pull request #48 from hellojavaer/1.0.x

hellojavaer · web-flow · commit 11254c008078 · 2018-01-06T21:28:00.000+08:00
1.0.x
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,24 @@
+*.java.hsp
+*.sonarj
+*.sw*
+jxl.log
+jmx.log
+.settings
+.DS_Store
+.springBeans
+
+classes/
+target/
+
+# Eclipse
+.classpath
+.project
+
+# IDEA
+*.iml
+*.ipr
+*.iws
+.idea
+out
+test-output
+atlassian-ide-plugin.xml
diff --git a/ddal-datasource/src/main/java/org/hellojavaer/ddal/datasource/DefaultDDALDataSource.java b/ddal-datasource/src/main/java/org/hellojavaer/ddal/datasource/DefaultDDALDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2017-2017 the original author or authors.`
	`2`	`+ * Copyright 2017-2018 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`