DogStark
diff --git a/‎stellar-contracts/src/lib.rs‎
Lines changed: 0 additions & 1 deletion b/‎stellar-contracts/src/lib.rs‎
Lines changed: 0 additions & 1 deletion
@@ -8375,7 +8375,6 @@ pub fn get_pet_age_with_lifespan(env: Env, pet_id: u64) -> PetAge {
         removed
     }
 } // end impl PetChainContract
->>>>>>> origin/main
 
 // --- OVERFLOW-SAFE COUNTER HELPER ---
 pub(crate) fn safe_increment(count: u64) -> u64 {
Original file line number	Diff line number	Diff line change
`@@ -8375,7 +8375,6 @@ pub fn get_pet_age_with_lifespan(env: Env, pet_id: u64) -> PetAge {`
`8375`	`8375`	`removed`
`8376`	`8376`	`}`
`8377`	`8377`	`} // end impl PetChainContract`
`8378`		`->>>>>>> origin/main`
`8379`	`8378`
`8380`	`8379`	`// --- OVERFLOW-SAFE COUNTER HELPER ---`
`8381`	`8380`	`pub(crate) fn safe_increment(count: u64) -> u64 {`