updated with new fortunes after annoying merge conflict.

diff --git a/database/fortunes.dat b/database/fortunes.dat
index 9397706ee8f0d9b36906bd243ebc1495c496a583..2ce1e95de733e26a260abc5bc9a8090cb915cdca 100644 (file)
--- a/database/fortunes.dat
+++ b/database/fortunes.dat
@@ -38357,7 +38357,6 @@ try to help each other and cultivate a feeling of affection for each other.
 That is the source of happiness in our life.
   -- H.H. the Dalai Lama
 ~
-<<<<<<< HEAD
   It's important to differentiate a thought from an emotion.  We say things
 such as, "I feel like they don't accept me." Actually, that is a thought.
 We may feel hurt or frustrated, and it's because we're thinking that others
@@ -38386,7 +38385,7 @@ gyay.  Sang means that all of the faults have been cleared away, while gyay
 means “full realization”; just as from darkness, the moon waxes, likewise
 from ignorance, the qualities of the mind’s intrinsic nature emerge.
   -- Chagdud Tulku Rinpoche
-=======
+~
 The fundamental teaching of the Buddha is that we should view others as being
 more important than we are.  Of course, you cannot completely ignore yourself.
 But neither can you neglect the welfare of other people and other sentient
@@ -38422,4 +38421,3 @@ happiness without any strings attached, without any expectations of what these
 people will do for us or how good they'll make us feel.
   -- Thubten Chodron, "Don't Believe Everything You Think: Living with Wisdom
      and Compassion"
->>>>>>> 07b7382f215ebc9c73697447a651d5d9763c617c