[MIRROR] Nope (#2715)

* Nope * Update secrets.dm
2017-09-13 22:50:15 -05:00
parent bba0bf02b5
commit 40e0bae912
1 changed files with 0 additions and 4 deletions
@@ -45,10 +45,6 @@
 		dat += {"
 			<B>Fun Secrets</B><BR>
 			<BR>
-<<<<<<< HEAD
-
-=======
->>>>>>> 6e5ebf9c41fc97d5ee0daf4fd22536844438ace0
 			<A href='?src=\ref[src];[HrefToken()];secrets=virus'>Trigger a Virus Outbreak</A><BR>
 			<A href='?src=\ref[src];[HrefToken()];secrets=monkey'>Turn all humans into monkeys</A><BR>
 			<A href='?src=\ref[src];[HrefToken()];secrets=anime'>Chinese Cartoons</A><BR>