From 1601c907aee9aba306160625368cd5ffbb41629b Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 20 Apr 2016 10:47:26 +0100 Subject: [PATCH] Fixed some merge-noise in NetworkGraphicsDemo --- examples/NetworkGraphicsDemo/Source/Demos.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/NetworkGraphicsDemo/Source/Demos.h b/examples/NetworkGraphicsDemo/Source/Demos.h index 48c52b64c4..a8b90a4018 100644 --- a/examples/NetworkGraphicsDemo/Source/Demos.h +++ b/examples/NetworkGraphicsDemo/Source/Demos.h @@ -405,7 +405,7 @@ struct FlockWithText : public FlockDemo String text = String (messages[currentMessage]).replace ("NUMDEVICES", String (canvas.clients.size())); AttributedString as; - as.append (text, Font(), String(), textSize * scale), Colour (0x80ffffff).withMultipliedAlpha (alpha)); + as.append (text, Font (textSize * scale), Colour (0x80ffffff).withMultipliedAlpha (alpha)); as.setJustification (Justification::centred); auto centre = canvas.clients[clientIndex % canvas.clients.size()].centre * scale;