Update MERGING.md

This commit is contained in:
Rochet2
2017-03-15 23:50:47 +02:00
committed by GitHub
parent 98d2137f20
commit 655e1a2a94

View File

@@ -7,9 +7,6 @@ We also do not fix any merging errors you may have, but you are free to ask abou
We recommend using the [installation guide](INSTALL.md) especially if you are not familiar with git and updating the code.
It allows you to simply use `git pull` followed by `git submodule update` to update your source and we will handle the merging and maintenance with the official core source. Naturally you still need to handle updating the database as instructed by the core's wiki or instructions.
###Unofficial Merging
We do not support unofficial merging. View [Unofficial Merging](http://emudevs.com/showthread.php/5000) thread.
### Merging Eluna with MaNGOS
Eluna is merged with [official MaNGOS](http://getmangos.eu/) by default.