Skip to content

Commit

Permalink
Merge pull request #46834 from withbest/master
Browse files Browse the repository at this point in the history
chore: fix some comments
  • Loading branch information
AndyScherzinger authored Jul 29, 2024
2 parents 3a7c18b + dd08f93 commit 13d2b67
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion apps/files/src/views/Navigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default defineComponent({
if (this.currentViewId !== this.currentView?.id) {
// This is guaranteed to be a view because `currentViewId` falls back to the default 'files' view
const view = this.views.find(({ id }) => id === this.currentViewId)!
// The the new view as active
// The new view as active
this.showView(view)
logger.debug(`Navigation changed from ${oldView} to ${newView}`, { to: view })
}
Expand Down
4 changes: 2 additions & 2 deletions build/stubs/intl.php
Original file line number Diff line number Diff line change
Expand Up @@ -2751,7 +2751,7 @@ public function getType() { }
* <b>IntlCalendar::DOW_SATURDAY</b>.
* </p>
* @return int
* The number of milliseconds into the day at which the the weekend begins or
* The number of milliseconds into the day at which the weekend begins or
* ends or <b>FALSE</b> on failure.
*/
public function getWeekendTransition($dayOfWeek) { }
Expand Down Expand Up @@ -5229,7 +5229,7 @@ function intlcal_get_type($calendar) { }
* <b>IntlCalendar::DOW_SATURDAY</b>.
* </p>
* @return int
* The number of milliseconds into the day at which the the weekend begins or
* The number of milliseconds into the day at which the weekend begins or
* ends or <b>FALSE</b> on failure.
* @since 5.5
*/
Expand Down
4 changes: 2 additions & 2 deletions cypress.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ declare global {
/**
* Unmock all initial states or one defined by app and key
*
* @param app app name of the inital state
* @param key the key of the the initial state
* @param app app name of the initial state
* @param key the key of the initial state
*/
unmockInitialState: (app?: string, key?: string) => void
}
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Wrapper/Encryption.php
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ public function fopen($path, $mode) {


/**
* perform some plausibility checks if the the unencrypted size is correct.
* perform some plausibility checks if the unencrypted size is correct.
* If not, we calculate the correct unencrypted size and return it
*
* @param string $path internal path relative to the storage root
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Remote/Instance.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function getUrl() {
}

/**
* @return string The of of the remote server with protocol
* @return string The of the remote server with protocol
*/
public function getFullUrl() {
return $this->getProtocol() . '://' . $this->getUrl();
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Remote/IInstance.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface IInstance {
public function getUrl();

/**
* @return string The of of the remote server with protocol
* @return string The of the remote server with protocol
*
* @since 13.0.0
* @deprecated 23.0.0
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Share_Backend_Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
namespace OCP;

/**
* Interface for collections of of items implemented by another share backend.
* Interface for collections of items implemented by another share backend.
* Extends the Share_Backend interface.
* @since 5.0.0
*/
Expand Down

0 comments on commit 13d2b67

Please sign in to comment.