Update README.md

atarw · web-flow · commit 0a5e770b0648 · 2018-08-13T09:39:45.000-04:00
diff --git a/README.md b/README.md
@@ -36,11 +36,8 @@ public class MaterialUISwingDemo {
 		frame.add (content, BorderLayout.CENTER);
 
 		// on hover, button will change to a light blue
-<<<<<<< refs/remotes/upstream/master
 		MaterialUIMovement.add (button, MaterialColors.LIGHT_BLUE_500);
-=======
 		MaterialUIMovement.add (button, MaterialColors.BLUE_400);
->>>>>>> fix support for jscrollbar
 
 		frame.pack ();
 		frame.setVisible (true);
