2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

merge conflict

Browse source
This commit is contained in:
Dennis Orlando 2025-08-02 06:13:30 +02:00
parent f301c424ba
commit e43f82b6ec
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/c3nav/editor/static/editor/css/editor.scss
View file

@ -607,7 +607,6 @@ label.theme-color-label {
z-index: 1000; z-index: 1000;
pointer-events: none; pointer-events: none;
} }
<<<<<<< HEAD
@keyframes snap-pulse { @keyframes snap-pulse {
0% { 0% {
@ -676,5 +675,3 @@ label.theme-color-label {
opacity: 0.7; opacity: 0.7;
} }
} }
=======
>>>>>>> 90d3c9b7f5f567b6bbe37f3432b49f65710bf26c