summaryrefslogtreecommitdiffstats
path: root/ruby-raa
diff options
context:
space:
mode:
authorVlad Glagolev2019-05-25 15:36:59 +0000
committerVlad Glagolev2019-05-25 15:36:59 +0000
commitdf5eabb5f195809bb86b70b659e754de5c975517 (patch)
treeab2793e19885ba048ea94572170d089b087eb98c /ruby-raa
parentc625484d31e08178cff784f3862158179ca4339d (diff)
gnome-art: correct HISTORY file
Diffstat (limited to 'ruby-raa')
-rw-r--r--ruby-raa/gnome-art/HISTORY3
1 files changed, 0 insertions, 3 deletions
diff --git a/ruby-raa/gnome-art/HISTORY b/ruby-raa/gnome-art/HISTORY
index db18bbe20f..627cb0d404 100644
--- a/ruby-raa/gnome-art/HISTORY
+++ b/ruby-raa/gnome-art/HISTORY
@@ -1,9 +1,6 @@
-<<<<<<< HEAD:ruby-raa/gnome-art/HISTORY
-=======
2008-01-12 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* INSTALL: uses setup.sh
->>>>>>> e085a55975f5251faca1b575d63fd33f50a43ee2:ruby-raa/gnome-art/HISTORY
2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED.