ChromaGaming/PluginConfigs
1
0
Fork 0
Code Issues 8 Pull requests 4 Projects Releases 10 Packages Wiki Activity

Reenable the AFK timer #71

Open
NorbiPeti wants to merge 1 commit from NorbiPeti-patch-1 into v5
pull from: NorbiPeti-patch-1
merge into: ChromaGaming:v5
Conversation 0 Commits 1 Files changed 1 +2 -2
NorbiPeti commented 2019-11-04 09:00:56 +00:00 (Migrated from github.com)
Copy link

It got fixed a while ago.

(Ignore the commented line, GitHub did that on mobile)

It got fixed a while ago. (Ignore the commented line, GitHub did that on mobile)
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin NorbiPeti-patch-1:NorbiPeti-patch-1
git checkout NorbiPeti-patch-1

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout v5
git merge --no-ff NorbiPeti-patch-1
git checkout NorbiPeti-patch-1
git rebase v5
git checkout v5
git merge --ff-only NorbiPeti-patch-1
git checkout NorbiPeti-patch-1
git rebase v5
git checkout v5
git merge --no-ff NorbiPeti-patch-1
git checkout v5
git merge --squash NorbiPeti-patch-1
git checkout v5
git merge --ff-only NorbiPeti-patch-1
git checkout v5
git merge NorbiPeti-patch-1
git push origin v5
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something isn't working

  
Config Change

   
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
Exploit

Intended mechanics are being used in ways that have unintended consequences.

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
lag/crash

The server can't run normally

  
question

Further information is requested

  
v5-beta

Issues found during the v5 beta

  
wontfix

This will not be worked on

No labels
bug
Config Change
duplicate
enhancement
Exploit
good first issue
help wanted
invalid
lag/crash
question
v5-beta
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: ChromaGaming/PluginConfigs#71
No description provided.
Delete branch "NorbiPeti-patch-1"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?