remove git symbols

ShaharNaveh · ShaharNaveh · commit 4b80a5d74a3c · 2025-10-22T12:21:23.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -159,15 +159,7 @@ rustpython-wtf8 = { path = "wtf8", version = "0.4.0" }
 rustpython-doc = { git = "https://github.com/RustPython/__doc__", tag = "0.3.0", version = "0.3.0" }
 
 ruff_python_parser = { git = "https://github.com/astral-sh/ruff.git", tag = "0.14.1" }
-<<<<<<< HEAD
 ruff_python_codegen = { git = "https://github.com/astral-sh/ruff.git", tag = "0.14.1" }
-||||||| 056795eed
-ruff_python_parser = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
-ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
-ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
-ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
-=======
->>>>>>> upstream/main
 ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", tag = "0.14.1" }
 ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", tag = "0.14.1" }
 ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", tag = "0.14.1" }
diff --git a/compiler/codegen/src/compile.rs b/compiler/codegen/src/compile.rs
@@ -147,7 +147,6 @@ enum ComprehensionType {
     Dict,
 }
 
-<<<<<<< HEAD
 fn unparse_expr(expr: &Expr) -> String {
     use ruff_python_ast::str::Quote;
     use ruff_python_codegen::{Generator, Indentation};
@@ -157,9 +156,6 @@ fn unparse_expr(expr: &Expr) -> String {
         .expr(expr)
 }
 
-||||||| 056795eed
-=======
->>>>>>> upstream/main
 fn validate_duplicate_params(params: &Parameters) -> Result<(), CodegenErrorType> {
     let mut seen_params = HashSet::new();
     for param in params {
