From 6191dad3a45715c1805ace6b141e99e0261f2bf4 Mon Sep 17 00:00:00 2001 From: sam edelsten <samedelsten1@gmail.com> Date: Wed, 25 Oct 2023 21:24:48 +0100 Subject: [PATCH] typo i do not like the online merge conflict editor --- src/render.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/render.rs b/src/render.rs index d7033a2..1a8deca 100644 --- a/src/render.rs +++ b/src/render.rs @@ -2,7 +2,7 @@ use std::time::Duration; use bevy::{ asset::HandleId, - prelude::*; + prelude::*, render::render_resource::Extent3d, window::{PrimaryWindow, WindowScaleFactorChanged}, }; @@ -12,7 +12,7 @@ use image::{imageops::FilterType, GenericImageView}; use crate::{ get_text_size, get_x_offset_center, get_y_offset_center, CosmicAttrs, CosmicBackground, CosmicCanvas, CosmicEditor, CosmicFontSystem, CosmicMetrics, CosmicMode, CosmicTextPosition, - FillColor, Focus, PasswordInput, Placeholder, ReadOnly, XOffset, DEFAULT_SCALE_PLACEHOLDER + FillColor, Focus, PasswordInput, Placeholder, ReadOnly, XOffset, DEFAULT_SCALE_PLACEHOLDER, }; #[derive(Resource)] -- GitLab