From 1e8ecb1f6b03872204bfb6ff47a59f5fb02af7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= <torsten.bogershausen@esss.se>
Date: Wed, 4 Dec 2019 16:11:52 +0100
Subject: [PATCH] Remove and ignore solution/TrialLicense.tclrs

Trial-licenses should not be part of any Git - they
experire and soon and cause a lot of merge-conflicts.

Remove solution/TrialLicense.tclrs and
ignore it in .gitignore (keep .gitignore sorted)
---
 .gitignore                  | 25 +++++++++++++------------
 solution/TrialLicense.tclrs |  2 --
 2 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 solution/TrialLicense.tclrs

diff --git a/.gitignore b/.gitignore
index 2d1ca8d..5853ffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,18 @@
+
+*.bak
+*.pyc
+*.suo
+*.tmc
+*.tpy
+*.~u
+*~
+.#*
+.epics.*
+\#*#
 _Boot/
 _CompileInfo/
 _Libraries/
+logs.0*
+solution/TrialLicense.tclrs
 tools/linux/ADS/
 tools/linux/getADSState/getADSState.bin
-logs.0*
-.epics.*
-*.bak
-*.~u
-*.pyc
-*.tpy
-*.suo
-*~
-.#*
-\#*#
-*.tmc
-
diff --git a/solution/TrialLicense.tclrs b/solution/TrialLicense.tclrs
deleted file mode 100644
index 1132474..0000000
--- a/solution/TrialLicense.tclrs
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TcLicenseInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2011/11/TcLicenseInfo"><LicenseInfo><SystemId>{52C4A619-551C-008A-DE5B-87C2D878314F}</SystemId><IssueTime>2019-06-20T07:59:00</IssueTime><ExpireTime>2019-06-28T00:00:00</ExpireTime><LicenseKey>440abbbe2f39181db097f16818237251fd1f2d0718115982971343370c9a4a58093f0af3461229dc88336bf779b68022b904abbf9339ebd5a3e73111bf8d2758177c4fbb82aa1b3482b71fef6f7a9b6300970484803798af4d353c784fdefb7b5accab29d326173225fc71fddd9406080470ea2f8a3f68bb26df6c0e7ff7fe974254b232fbf8028e90b2ac13c20814290951e328ff7dbfc8165a7725f2ab3fedde40703fef94b94eb878dd5405b279dd070c783c8c962192b0fcdc7877841ccd04669fa108e4a857081bc8c510cc8548b38d441e6c1199c59d543223ab5453adfbb6e5133d1ac99c0d8608066a000a15787944e475d15e777e111450f531be85</LicenseKey><License><LicenseId>{4C256767-E6E6-4AF5-BD68-9F7ABAD0C200}</LicenseId><Name>TC3 ADS</Name><OrderNo>TC1000</OrderNo></License><License><LicenseId>{3FF18E97-7754-401B-93FB-70544DE28A13}</LicenseId><Name>TC3 IO</Name><OrderNo>TC1100</OrderNo></License><License><LicenseId>{66689887-CCBD-452C-AC9A-039D997C6E66}</LicenseId><Name>TC3 PLC</Name><OrderNo>TC1200</OrderNo></License><License><LicenseId>{A19036CF-A53B-4E3A-99FF-023EF5C4798B}</LicenseId><Name>TC3 NC PTP Axis</Name><Instances>10</Instances></License><License><LicenseId>{520DE751-9DB6-47CB-8240-BD5C466E7E64}</LicenseId><Name>TC3 NC PTP</Name><OrderNo>TF5000</OrderNo></License><License><LicenseId>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</LicenseId><Name>TC3 TCP/IP</Name><OrderNo>TF6310</OrderNo></License></LicenseInfo></TcLicenseInfo>