Browse Source

Merge branch 'master' of https://github.com/Tankernn/JavaGridControl.git

Conflicts:
	.gitignore
	LICENSE
Tankernn 3 years ago
parent
commit
41e2502948
2 changed files with 4 additions and 2 deletions
  1. 3 0
      .gitignore
  2. 1 2
      LICENSE

+ 3 - 0
.gitignore

@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 /target/
+=======
+>>>>>>> branch 'master' of https://github.com/Tankernn/JavaGridControl.git
 *.class
 
 # Mobile Tools for Java (J2ME)

+ 1 - 2
LICENSE

@@ -17,5 +17,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE