Skip to content

Commit ae8e6b1

Browse files
Fix links
1 parent 1a4d6d5 commit ae8e6b1

File tree

2 files changed

+2
-4
lines changed
  • content/en/docs

2 files changed

+2
-4
lines changed

content/en/docs/refguide/version-control/using-version-control-in-studio-pro/merge-algorithm.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,6 @@ The **Show file conflicts** button is shown when there are conflicts in files wh
312312

313313
When clicked, it opens up a pop-up window with a list of all the files that are affected by the update process, with conflicted ones at the top of the list.
314314

315-
You can also use the [Show Changes on Disk](/refguide/version-control-menu/#show-changes) menu item instead.
316-
317315
### Rebase-Specific Controls
318316

319317
There are some buttons which are only shown when conflicts are found when doing a rebase.

content/en/docs/releasenotes/studio-pro/10/10.6.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This is the [MTS](/releasenotes/studio-pro/lts-mts/#mts) version 10 release for
4949
* Fixed in [10.21.0](/releasenotes/studio-pro/10.21/#fix-workflow-instances).
5050
* There is a positioning error in the logic editors when you are dragging a large element, such as a loop, into a sequence flow, it overlaps with the existing elements.
5151
* Fixed in [10.12.12](/releasenotes/studio-pro/10.12/#fix-positioning-error) and in [10.14.0](/releasenotes/studio-pro/10.14/#fix-positioning-error).
52-
* Line endings in CSS files are not being handled properly, so when using [Revert All Changes](/refguide/using-version-control-in-studio-pro/) or performing other version-control operations, CSS files appear in the [Changes on Disk](/refguide/version-control-menu/#show-changes) dialog box.
52+
* Line endings in CSS files are not being handled properly, so when using [Revert All Changes](/refguide/using-version-control-in-studio-pro/) or performing other version-control operations, CSS files appear in the **Changes on Disk** dialog box.
5353
* Fixed in [10.18.0](/releasenotes/studio-pro/10.18/#fix-line-endings).
5454

5555
## 10.6.23 {#10623}
@@ -73,7 +73,7 @@ This is the [MTS](/releasenotes/studio-pro/lts-mts/#mts) version 10 release for
7373
* Fixed in [10.21.0](/releasenotes/studio-pro/10.21/#fix-workflow-instances).
7474
* There is a positioning error in the logic editors when you are dragging a large element, such as a loop, into a sequence flow, it overlaps with the existing elements.
7575
* Fixed in [10.12.12](/releasenotes/studio-pro/10.12/#fix-positioning-error) and in [10.14.0](/releasenotes/studio-pro/10.14/#fix-positioning-error).
76-
* Line endings in CSS files are not being handled properly, so when using [Revert All Changes](/refguide/using-version-control-in-studio-pro/) or performing other version-control operations, CSS files appear in the [Changes on Disk](/refguide/version-control-menu/#show-changes) dialog box.
76+
* Line endings in CSS files are not being handled properly, so when using [Revert All Changes](/refguide/using-version-control-in-studio-pro/) or performing other version-control operations, CSS files appear in the **Changes on Disk** dialog box.
7777
* Fixed in [10.18.0](/releasenotes/studio-pro/10.18/#fix-line-endings).
7878

7979
## 10.6.22 {#10622}

0 commit comments

Comments
 (0)