Cutieguwu/raven
1
0
Fork 1
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Zed mucked something up with the merge. Fix it.

Browse Source
This commit is contained in:
Olivia Brooks
2026-01-27 21:32:18 -05:00
parent 649507bbcb
commit f3f79a12df
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@@ -140,16 +140,6 @@ fn init() -> anyhow::Result<()> {
f.write_all(include_bytes!("../assets/src/main/Main.java"))?; f.write_all(include_bytes!("../assets/src/main/Main.java"))?;
} }
<<<<<<< HEAD
// Make src/test/Test.java
if let Result::Ok(mut f) = OpenOptions::new().write(true).create_new(is_empty).open(
DIR_TEST
.clone()
.join("Test")
.with_extension(JAVA_EXT_SOURCE),
) {
f.write_all(include_bytes!("../assets/src/test/Test.java"))?;
=======
// Make src/test/MainTest.java // Make src/test/MainTest.java
if let Result::Ok(mut f) = OpenOptions::new().write(true).create_new(is_empty).open( if let Result::Ok(mut f) = OpenOptions::new().write(true).create_new(is_empty).open(
DIR_TEST DIR_TEST
@@ -158,7 +148,6 @@ fn init() -> anyhow::Result<()> {
.with_extension(JAVA_EXT_SOURCE), .with_extension(JAVA_EXT_SOURCE),
) { ) {
f.write_all(include_bytes!("../assets/src/test/MainTest.java"))?; f.write_all(include_bytes!("../assets/src/test/MainTest.java"))?;
>>>>>>> e79c26c (Fix build; Correct target/ path in generated .gitignore)
} }
// git init . // git init .