Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-08-25 04:42:20 +0000
committerEike Stepper2020-08-25 04:42:20 +0000
commitf143f4b2ffb48b353d7d93781d4fb4c383382533 (patch)
tree2462b060ae904c7578a938ac40a092cad8c54c33 /plugins/org.eclipse.net4j.tcp
parent1710aab6dd82537bd9dfcd780ccf7f0669c7d6ca (diff)
downloadcdo-f143f4b2ffb48b353d7d93781d4fb4c383382533.tar.gz
cdo-f143f4b2ffb48b353d7d93781d4fb4c383382533.tar.xz
cdo-f143f4b2ffb48b353d7d93781d4fb4c383382533.zip
[Releng] Remove bogus Git merge markers
Diffstat (limited to 'plugins/org.eclipse.net4j.tcp')
-rw-r--r--plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs3
1 files changed, 0 insertions, 3 deletions
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
index 97144f555d..5fb3408474 100644
--- a/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.tcp/.settings/org.eclipse.jdt.core.prefs
@@ -143,10 +143,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-<<<<<<< websockets
-=======
org.eclipse.jdt.core.compiler.release=enabled
->>>>>>> c1ed48e [561115] Implement a Websocket-based transport for Net4j
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW

Back to the top