Revision: 6506
          http://care2002.svn.sourceforge.net/care2002/?rev=6506&view=rev
Author:   mizuko
Date:     2010-06-30 15:40:10 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------


Modified Paths:
--------------
    
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl

Modified: 
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
===================================================================
--- 
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
       2010-06-30 14:59:13 UTC (rev 6505)
+++ 
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
       2010-06-30 15:40:10 UTC (rev 6506)
@@ -1,5 +1,9 @@
 {{* Repair request input form. repair_request.tpl 2004-06-12 Elpidio Latorilla 
*}}
+<<<<<<< .mine
+{{* Used by /modules/tech/tech-repair-request.php *}}
+=======
 {{* Used by /modules/tech/tech-reparatur-anfordern.php *}}
+>>>>>>> .r6505
 {{* Note: never rename the input, when redimensioning or repositioning it  *}}
 
 <ul>


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
Care2002-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/care2002-developers

Reply via email to