xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-14 16:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Shadowss/TravianZ

Browse Source 
Conflicts:
	Admin/Templates/config.tpl
	Admin/Templates/editServerSet.tpl
This commit is contained in:
Shadow
2014-03-10 08:39:06 +02:00
parent c848e87fb7 743a19326c
commit 15c6bb2fea
18 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/editServerSet.tpl
+6
View File
@@ -289,8 +289,14 @@ function refresh(tz) {
<tr>
<td>Error Reporting</td>
<td><select name="error">
<<<<<<< HEAD
<option value="error_reporting (E_ALL ^ E_NOTICE);" <?php if(ERROR_REPORTING=="error_reporting (E_ALL ^ E_NOTICE);") echo "selected";?>>Yes</option>
<option value="error_reporting (0);" <?php if(ERROR_REPORTING=="error_reporting (0);") echo "selected";?>>No</option>
=======
<option value="error_reporting (E_ALL ^ E_NOTICE);" <?php if(ERROR_REPORT=="error_reporting (E_ALL ^ E_NOTICE);") echo "selected";?>>Yes</option>
<option value="error_reporting (0);" <?php if(ERROR_REPORT=="error_reporting (0);") echo "selected";?>>No</option>
>>>>>>> 743a19326cddff179e325da92167a5362a94a6a2
</select>
</td>
</tr>