Skip to content

Commit

Permalink
Fix merge up to master
Browse files Browse the repository at this point in the history
  • Loading branch information
holdenk committed Apr 8, 2014
1 parent d3fe909 commit 77048f8
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.api.java

import java.util.{Comparator, List => JList}
import java.util.{Comparator, List => JList, Iterator => JIterator}
import java.lang.{Iterable => JIterable}

import scala.collection.JavaConversions._
Expand Down

0 comments on commit 77048f8

Please sign in to comment.