Fixed from merge.
This commit is contained in:
parent
7fb4b90387
commit
990c5673a1
|
@ -22,9 +22,4 @@
|
||||||
<priority>1</priority>
|
<priority>1</priority>
|
||||||
</email>
|
</email>
|
||||||
</user>
|
</user>
|
||||||
<<<<<<< HEAD
|
|
||||||
</alert>
|
</alert>
|
||||||
|
|
||||||
=======
|
|
||||||
</alert>
|
|
||||||
>>>>>>> upstream/master
|
|
||||||
|
|
Loading…
Reference in New Issue