From 875508253753e071ed532192194adc35ce607916 Mon Sep 17 00:00:00 2001
From: James Bornholt <bornholt@amazon.com>
Date: Mon, 6 Feb 2023 20:11:24 +0000
Subject: [PATCH] Fix merge conflict

Signed-off-by: James Bornholt <bornholt@amazon.com>
---
 s3-file-connector/tests/cli.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/s3-file-connector/tests/cli.rs b/s3-file-connector/tests/cli.rs
index dad6e9115..833b1c6a2 100644
--- a/s3-file-connector/tests/cli.rs
+++ b/s3-file-connector/tests/cli.rs
@@ -105,6 +105,7 @@ fn print_version_short() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
+#[test]
 fn addressing_style_mutually_exclusive() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("s3-file-connector")?;