summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-01-05 22:03:32 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-01-05 22:03:32 +0100
commitbbc8f837d72b9bc5f6a0b3125b54c246fb3b2b94 (patch)
tree749e2b339ca8ca08a6f5d28befc6a3f137fc2d01 /core
parenta848306b89053ef4ba2aeb4eb7899bec94d93cb3 (diff)
parent8311500ac03a95927022d8eec8178ba7d87b0010 (diff)
downloadiced-bbc8f837d72b9bc5f6a0b3125b54c246fb3b2b94.tar.gz
iced-bbc8f837d72b9bc5f6a0b3125b54c246fb3b2b94.tar.bz2
iced-bbc8f837d72b9bc5f6a0b3125b54c246fb3b2b94.zip
Merge branch 'master' into feature/custom-styling
Diffstat (limited to 'core')
-rw-r--r--core/src/background.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/background.rs b/core/src/background.rs
index 2f75e45c..e1a37ddc 100644
--- a/core/src/background.rs
+++ b/core/src/background.rs
@@ -12,4 +12,4 @@ impl From<Color> for Background {
fn from(color: Color) -> Self {
Background::Color(color)
}
-} \ No newline at end of file
+}