File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 4242 git branch -M style/ui
4343 git fetch origin style/ui
4444
45- # Merge changes and override conflicts with ours
45+ # Merge changes and override conflicts with ours --allow-unrelated-histories
4646 git merge -X ours origin/style/ui
4747
4848 # Push the changes to the style/ui branch
Original file line number Diff line number Diff line change @@ -34,8 +34,8 @@ $persian-red: #cf3030 !default;
3434$mango-tango : #e97500 !default ;
3535
3636
37- // Swaggy-Swagger Theme
38- // for workflow test
37+ // Swaggy-Swagger Theme
38+ // for workflow test !!
3939$color-primary : #2B6764 !default ;
4040$color-secondary : #877455 !default ;
4141$color-info : #4990e2 !default ;
@@ -227,4 +227,4 @@ $topbar-download-url-button-font-color: white !default;
227227
228228$text-body-default-font-color : $bright-gray !default ;
229229$text-code-default-font-color : $bright-gray !default ;
230- $text-headline-default-font-color : $bright-gray !default ;
230+ $text-headline-default-font-color : $bright-gray !default ;
You can’t perform that action at this time.
0 commit comments