fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

1
2
3
4
5
6
7
8
<?xml version="1.0" encoding="utf-8"?> 
<Animals> 
  <dog>hei bei</dog> 
  <pig>pei qi</pig> 
  <Cat>hua mao</Cat> 
  <Cat name="jiafei" color="yellow">jia fei mao</Cat> 
  <Cat name="jingzhang" color="black">hei mao jing zhang</Cat> 
</Animals>