From: Paul Poulain <paul.poulain@biblibre.com>
Date: Fri, 5 Jun 2009 06:36:11 +0000 (+0200)
Subject: merge error : reintroducing ajax.tmpl
X-Git-Tag: v3.02.00-alpha~54^2~308
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=eba29b259b513a7c10a1b8ca3ac06ead074ef72e;hp=521bb9654dd87078adc03def1f5cccfc1c80102d;p=koha_ffzg

merge error : reintroducing ajax.tmpl
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ajax.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ajax.tmpl
new file mode 100644
index 0000000000..13b3f76d1a
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ajax.tmpl
@@ -0,0 +1 @@
+<!-- TMPL_IF name="return" --><!-- TMPL_VAR name="return" --><!--/TMPL_IF-->