microcosm.blue / microcosm-rs
Constellation, Spacedust, Slingshot, UFOs: atproto crates and services for microcosm
fork atom

Fix botched merge conflict (2d97b62) resolution

authored by seoul.systems and committed by tangled.org d4bbd7bb a9cdfb73

+1 -2
unified split
+1 -2
constellation/src/server/mod.rs
··· 797 } 798 799 #[derive(Clone, Deserialize)] 800 - struct GetDistinctItemsQuery { 801 subject: String, 802 source: String, 803 cursor: Option<OpaqueApiCursor>, ··· 855 GetBacklinkDidsResponse { 856 total: paged.total, 857 linking_dids: paged.items, 858 - >>>>>>> 7a3e36b (Add getDistinct XRPC equivalent to REST /links/distinct-dids) 859 cursor, 860 query: (*query).clone(), 861 },
··· 797 } 798 799 #[derive(Clone, Deserialize)] 800 + struct GetBacklinkDidsQuery { 801 subject: String, 802 source: String, 803 cursor: Option<OpaqueApiCursor>, ··· 855 GetBacklinkDidsResponse { 856 total: paged.total, 857 linking_dids: paged.items, 858 cursor, 859 query: (*query).clone(), 860 },