From 742ebfa8acaf9bb0bc785848110dc8edd18c36fb Mon Sep 17 00:00:00 2001
From: JMS55 <47158642+JMS55@users.noreply.github.com>
Date: Sun, 6 Jul 2025 17:15:29 -0400
Subject: [PATCH] Fix merge

---
 crates/bevy_anti_aliasing/src/dlss/mod.rs | 2 +-
 crates/bevy_render/src/view/mod.rs        | 1 +
 examples/3d/anti_aliasing.rs              | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_anti_aliasing/src/dlss/mod.rs b/crates/bevy_anti_aliasing/src/dlss/mod.rs
index 186ae26f04..dae40e1082 100644
--- a/crates/bevy_anti_aliasing/src/dlss/mod.rs
+++ b/crates/bevy_anti_aliasing/src/dlss/mod.rs
@@ -14,7 +14,7 @@ use bevy_ecs::{
 use bevy_reflect::{prelude::ReflectDefault, reflect_remote, Reflect};
 use bevy_render::{
     camera::{MipBias, TemporalJitter},
-    render_graph::{RenderGraphApp, ViewNodeRunner},
+    render_graph::{RenderGraphExt, ViewNodeRunner},
     renderer::RenderDevice,
     view::{prepare_view_targets, prepare_view_uniforms, Hdr},
     ExtractSchedule, Render, RenderApp, RenderSystems,
diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
index 97a1d1aedc..839231e083 100644
--- a/crates/bevy_render/src/view/mod.rs
+++ b/crates/bevy_render/src/view/mod.rs
@@ -3,6 +3,7 @@ pub mod window;
 
 use bevy_camera::{
     primitives::Frustum, CameraMainTextureUsages, ClearColor, ClearColorConfig, Exposure,
+    MainPassResolutionOverride,
 };
 use bevy_diagnostic::FrameCount;
 pub use visibility::*;
diff --git a/examples/3d/anti_aliasing.rs b/examples/3d/anti_aliasing.rs
index 3a97d44b6d..44632fd07a 100644
--- a/examples/3d/anti_aliasing.rs
+++ b/examples/3d/anti_aliasing.rs
@@ -43,7 +43,6 @@ type TaaComponents = (
     TemporalAntiAliasing,
     TemporalJitter,
     MipBias,
-    MipBias,
     DepthPrepass,
     MotionVectorPrepass,
 );