We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 0a5e770 commit 472d611Copy full SHA for 472d611
README.md
@@ -36,8 +36,11 @@ public class MaterialUISwingDemo {
36
frame.add (content, BorderLayout.CENTER);
37
38
// on hover, button will change to a light blue
39
+<<<<<<< refs/remotes/upstream/master
40
MaterialUIMovement.add (button, MaterialColors.LIGHT_BLUE_500);
41
+=======
42
MaterialUIMovement.add (button, MaterialColors.BLUE_400);
43
+>>>>>>> fix support for jscrollbar
44
45
frame.pack ();
46
frame.setVisible (true);
0 commit comments