Fix rebase errors

Author: joel-costigliola

assertions-examples/src/test/java/org/assertj/examples/IterableAssertionsExamples.java

@@ -38,6 +38,7 @@
 import static org.assertj.examples.extractor.TolkienCharactersExtractors.race;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;

assertions-examples/src/test/java/org/assertj/examples/StringAssertionsExamples.java

@@ -14,7 +14,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Arrays.array;
-import static org.assertj.core.util.IterableUtil.smartFormat;
 import static org.assertj.core.util.Lists.newArrayList;
 
 import java.io.File;
@@ -218,7 +217,7 @@ public void containsPattern_assertion_example() {
   @Test
   public void multine_collection_formatting() {
     String[] greatBooks = array("A Game of Thrones", "The Lord of the Rings", "Assassin's Apprentice  ....");
-    String smartFormat = smartFormat(StandardRepresentation.STANDARD_REPRESENTATION, newArrayList(greatBooks));
+    String smartFormat = StandardRepresentation.STANDARD_REPRESENTATION.toStringOf(newArrayList(greatBooks));
     log.info(smartFormat);
   }