aboutsummaryrefslogtreecommitdiff
path: root/dev/share/ponysay/ttyponies
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2012-08-19 19:52:18 +0200
committerMattias Andrée <maandree@operamail.com>2012-08-19 19:52:18 +0200
commit64b726770a07a0e04bcec3cf8ab23af4bcc2332f (patch)
treea2d2b4fb14895486c04262da022d4bdea7acd7d6 /dev/share/ponysay/ttyponies
parent41b2d257c71f654dd2fd9921d1f75f44b97a6592 (diff)
parent6dc632a155db800997e0eb2dec420a6233a2d141 (diff)
downloadponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.gz
ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.bz2
ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.zip
merge conflict resolved
Diffstat (limited to 'dev/share/ponysay/ttyponies')
l---------dev/share/ponysay/ttyponies1
1 files changed, 0 insertions, 1 deletions
diff --git a/dev/share/ponysay/ttyponies b/dev/share/ponysay/ttyponies
deleted file mode 120000
index a96a071..0000000
--- a/dev/share/ponysay/ttyponies
+++ /dev/null
@@ -1 +0,0 @@
-../../../ttyponies \ No newline at end of file