Fix compile-time error.

khatchad · khatchad · commit a7b7b5046f4c · 2018-02-21T14:15:15.000-05:00
diff --git a/edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamAnalyzer.java b/edu.cuny.hunter.streamrefactoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamAnalyzer.java
@@ -124,7 +124,6 @@ public StreamAnalyzer(boolean visitDocTags, int nForStreams, boolean findImplici
 	 * @see #analyze(Optional).
 	 */
 	public Map<IJavaProject, Collection<Entrypoint>> analyze() throws CoreException {
-<<<<<<< HEAD
 		return this.analyze(Optional.empty());
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,6 @@ public StreamAnalyzer(boolean visitDocTags, int nForStreams, boolean findImplici`
`124`	`124`	`* @see #analyze(Optional).`
`125`	`125`	`*/`
`126`	`126`	`public Map<IJavaProject, Collection<Entrypoint>> analyze() throws CoreException {`
`127`		`-<<<<<<< HEAD`
`128`	`127`	`return this.analyze(Optional.empty());`
`129`	`128`	`}`
`130`	`129`