Skip to content

Commit

Permalink
Fix config file after the latest patches
Browse files Browse the repository at this point in the history 
[ci skip]

Signed-off-by: Xfurry <xfurry.cmangos@outlook.com>
  • Loading branch information
@xfurry
xfurry committed Jan 7, 2018
1 parent f42a044 commit f7af961
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/mangosd/mangosd.conf.dist.in
View file
Expand Up @@ -1621,7 +1621,6 @@ Arena.StartPersonalRating = -1
# OutdoorPvp.TFEnabled #Enable Terokkar Forest Outdoor pvp
# OutdoorPvp.NAEnabled #Enable Halaa (Nagrand) Outdoor pvp
# OutdoorPvp.GHEnabled #Enable Venture Bay (Grizzly Hills) Outdoor pvp
# OutdoorPvp.WGEnabled #Enable Wintergrasp Outdoor pvp
# Default: 1 (enable)
# 0 (disable)
#
Expand All @@ -1634,7 +1633,6 @@ OutdoorPvp.ZMEnabled = 1
OutdoorPvp.TFEnabled = 1
OutdoorPvp.NAEnabled = 1
OutdoorPvp.GHEnabled = 1
OutdoorPvp.WGEnabled = 1

###################################################################################################################
# BATTLEFIELD CONFIG
Expand Down

4 comments on commit f7af961

@cala
Copy link
Contributor

@cala cala commented on f7af961 Jan 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xfurry by any chance, did you made a force push recently (today) ? I'm asking because my local GitHubt client is telling me that my git history is different from the origin remote history.

@xfurry
Copy link
Member Author

@xfurry xfurry commented on f7af961 Jan 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cala yes I did. There was a mistake in one of my recent commits, so I had to fix it.
I'm sorry for creating trouble.

@cala
Copy link
Contributor

@cala cala commented on f7af961 Jan 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries, it is easy to fix. I just wanted to make sure that the issue was not coming from my side. 😉
And by the way, this is very nice to see you around. :)

@xfurry
Copy link
Member Author

@xfurry xfurry commented on f7af961 Jan 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

I think this issue shouldn't happen to people who did not update local repository before the forced push, which was just a few hours ago.

Please sign in to comment.