aboutsummaryrefslogtreecommitdiff
path: root/dev
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
parent41b2d257c71f654dd2fd9921d1f75f44b97a6592 (diff)
parent6dc632a155db800997e0eb2dec420a6233a2d141 (diff)
downloadponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.gz
ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.bz2
ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.zip
merge conflict resolved
Diffstat (limited to 'dev')
l---------dev/bin/ponysay1
l---------dev/lib/ponysay/linklist.pl1
l---------dev/lib/ponysay/list.pl1
l---------dev/lib/ponysay/pq4ps1
l---------dev/lib/ponysay/pq4ps-list.pl1
l---------dev/lib/ponysay/pq4ps.pl1
l---------dev/share/ponysay/ponies1
l---------dev/share/ponysay/quotes1
l---------dev/share/ponysay/ttyponies1
9 files changed, 0 insertions, 9 deletions
diff --git a/dev/bin/ponysay b/dev/bin/ponysay
deleted file mode 120000
index c19b7f1..0000000
--- a/dev/bin/ponysay
+++ /dev/null
@@ -1 +0,0 @@
-../../ponysay \ No newline at end of file
diff --git a/dev/lib/ponysay/linklist.pl b/dev/lib/ponysay/linklist.pl
deleted file mode 120000
index 36373a0..0000000
--- a/dev/lib/ponysay/linklist.pl
+++ /dev/null
@@ -1 +0,0 @@
-../../../linklist.pl \ No newline at end of file
diff --git a/dev/lib/ponysay/list.pl b/dev/lib/ponysay/list.pl
deleted file mode 120000
index 3062411..0000000
--- a/dev/lib/ponysay/list.pl
+++ /dev/null
@@ -1 +0,0 @@
-../../../list.pl \ No newline at end of file
diff --git a/dev/lib/ponysay/pq4ps b/dev/lib/ponysay/pq4ps
deleted file mode 120000
index a13c205..0000000
--- a/dev/lib/ponysay/pq4ps
+++ /dev/null
@@ -1 +0,0 @@
-../../../pq4ps \ No newline at end of file
diff --git a/dev/lib/ponysay/pq4ps-list.pl b/dev/lib/ponysay/pq4ps-list.pl
deleted file mode 120000
index c6915d4..0000000
--- a/dev/lib/ponysay/pq4ps-list.pl
+++ /dev/null
@@ -1 +0,0 @@
-../../../pq4ps-list.pl \ No newline at end of file
diff --git a/dev/lib/ponysay/pq4ps.pl b/dev/lib/ponysay/pq4ps.pl
deleted file mode 120000
index 97a27cc..0000000
--- a/dev/lib/ponysay/pq4ps.pl
+++ /dev/null
@@ -1 +0,0 @@
-../../../pq4ps.pl \ No newline at end of file
diff --git a/dev/share/ponysay/ponies b/dev/share/ponysay/ponies
deleted file mode 120000
index b317951..0000000
--- a/dev/share/ponysay/ponies
+++ /dev/null
@@ -1 +0,0 @@
-../../../ponies \ No newline at end of file
diff --git a/dev/share/ponysay/quotes b/dev/share/ponysay/quotes
deleted file mode 120000
index d9c9006..0000000
--- a/dev/share/ponysay/quotes
+++ /dev/null
@@ -1 +0,0 @@
-../../../quotes \ No newline at end of file
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