@@ -1820,11 +1820,7 @@ export default {
"is_diff",
"config",
"other_config",
-<<<<<<< HEAD
'cgd_gold_price'
-=======
- "cgd_gold_price",
->>>>>>> sit
];
for (let i = 0; i < list.length; i++) {
this.rulesThis[list[i]][0].required = this.is_noble;