Skip to content
This repository was archived by the owner on Feb 28, 2021. It is now read-only.

Commit 5ee4f52

Browse files
committed
Merge branch 'master' into xla/239-adjust-project-name-validation
2 parents 693b7c9 + 9e7fe9a commit 5ee4f52

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

client/examples/project_registration.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ async fn go() -> Result<(), Error> {
1919
let node_host = url::Host::parse("127.0.0.1").unwrap();
2020
let client = Client::create(node_host).await?;
2121

22-
<<<<<<< HEAD
2322
let project_name = ProjectName::try_from("radicle-registry".to_string()).unwrap();
24-
=======
25-
let project_name = ProjectName::from_string("radicle-registry".to_string()).unwrap();
26-
>>>>>>> master
2723
let org_id = OrgId::try_from("monadic").unwrap();
2824

2925
// Choose some random project hash and create a checkpoint

core/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ pub use project_name::ProjectName;
4545
mod org_id;
4646
pub use org_id::OrgId;
4747

48+
mod org_id;
49+
pub use org_id::OrgId;
50+
4851
mod error;
4952
pub use error::RegistryError;
5053

0 commit comments

Comments
 (0)