User avatar thewitness

Resource update

Cacti / webseerDutch

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerKorean

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerJapanese

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerItalian

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerHindi

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerHebrew (Israel)

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerFrench

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerSpanish

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerGreek

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerGerman

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerBulgarian

Resource update 3 years ago
Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / webseerEnglish

Resource update 3 years ago
User avatar None

Component automatically unlocked

Cacti / webseer

Component automatically unlocked 3 years ago
User avatar thewitness

Reset repository

Cacti / webseer

Reset repository 3 years ago
User avatar None

Failed rebase on repository

Cacti / webseer

First, rewinding head to replay your work on top of it...
Applying: Update translation files
Using index info to reconstruct a base tree...
M	locales/po/cacti.pot
Falling back to patching base and 3-way merge...
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Update translation files
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
 (1)
3 years ago
User avatar None

Component automatically locked

Cacti / webseer

Component automatically locked 3 years ago
User avatar None

New alert

Cacti / webseer

Could not merge the repository. 3 years ago
User avatar None

Failed rebase on repository

Cacti / webseer

First, rewinding head to replay your work on top of it...
Applying: Update translation files
Using index info to reconstruct a base tree...
M	locales/po/cacti.pot
Falling back to patching base and 3-way merge...
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Update translation files
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
 (1)
3 years ago
User avatar None

Received repository notification

Cacti / webseer

GitHub: https://github.com/Cacti/plugin_webseer, develop 3 years ago

Search