Projects >> sveditor >>a7be8b9457d61e61bdf77b7ed0aa17be6a91c1f0

Chunk
Conflicting content 
	public static final String MiscOps[] = { ":", "::", ":/", ":=", "+:", "-:", // array-index
																				// operators
<<<<<<< HEAD
			",", ";", ".", ".*", "'", "->", "->>", "#", "##", "@", "@@", "(*", "*)",
=======
			",", ";", ".", ".*", "'", "->", "->>", "-->", "#", "##", "@", "@@", "(*", "*)",
>>>>>>> ec82b79ee83343859fd68817f40afb7536836657
			// Assertion operators
			"=>", "|=>", "|->", "#-#", "#=#", "##",
			"--", "++"};
Solution content 
	public static final String MiscOps[] = { ":", "::", ":/", ":=", "+:", "-:", // array-index
																				// operators
			",", ";", ".", ".*", "'", "->", "->>", "-->", "#", "##", "@", "@@", "(*", "*)",
			// Assertion operators
			"=>", "|=>", "|->", "#-#", "#=#", "##",
			"--", "++"};
File
SVLexer.java
Developer's decision
Version 2
Kind of conflict
Other