Skip to content

Commit

Permalink
fix: merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
Myriad-Dreamin committed Jan 17, 2025
1 parent 4c52d05 commit 225a7a8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 0 additions & 3 deletions crates/tinymist-world/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ use reflexo_typst::vfs::{system::SystemAccessModel, Vfs};
use reflexo_typst::{CompilerFeat, ImmutPath, TypstDict};
use serde::{Deserialize, Serialize};

pub mod font;
pub mod project;

use crate::font::TinymistFontResolver;
use crate::project::SyncInterrupt;

Expand Down
7 changes: 7 additions & 0 deletions crates/tinymist-world/src/project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
#![allow(missing_docs)]

mod lock;
pub use lock::*;
mod model;
pub use model::*;
mod args;
pub use args::*;

use std::{
collections::HashSet,
path::Path,
Expand Down

0 comments on commit 225a7a8

Please sign in to comment.