Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

La til en del beskrivelser #10

Merged
merged 10 commits into from
Jan 23, 2025
Merged

La til en del beskrivelser #10

merged 10 commits into from
Jan 23, 2025

Conversation

trondhjort
Copy link
Contributor

@trondhjort trondhjort commented Jan 20, 2025

La til og justerte noen beskrivelser på tekledradar.

@trondhjort trondhjort requested a review from TheKnarf as a code owner January 20, 2025 14:25
@trondhjort trondhjort requested a review from amalieeh January 20, 2025 14:27
@trondhjort trondhjort requested a review from gam January 20, 2025 15:20
@gam
Copy link
Member

gam commented Jan 20, 2025

Da tror jeg konfliktene mellom min og Tronds branch skal være løst. Har laget en flettet versjon med utgangspunkt i de to variantene.

Har merget resultatet hit, og fjernet min branch og PR.

@trondhjort: Det ser ikke ut til at branchen vil la seg merge med main automagisk. Gi lyd om du vil se på det sammen.

@trondhjort
Copy link
Contributor Author

Noe jeg må gjøre? Eller mangler bare approval fra @amalieeh?

@amalieeh
Copy link
Contributor

Jeg tenker at nå som dere har lest over hverandres brancher så holder det 😄

Branchen må bare oppdateres med main så man kan merge

@trondhjort trondhjort merged commit 2304471 into main Jan 23, 2025
2 checks passed
@trondhjort trondhjort deleted the tekradar-oppdateringer branch January 23, 2025 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants