aboutsummaryrefslogtreecommitdiff
path: root/.gitmodules
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 /.gitmodules
parent41b2d257c71f654dd2fd9921d1f75f44b97a6592 (diff)
parent6dc632a155db800997e0eb2dec420a6233a2d141 (diff)
downloadponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.gz
ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.tar.bz2
ponysay-64b726770a07a0e04bcec3cf8ab23af4bcc2332f.zip
merge conflict resolved
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 1560352..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ponyquotes4ponysay"]
- path = ponyquotes4ponysay
- url = git://github.com/maandree/ponyquotes4ponysay.git