SF.net SVN: ledger-smb:[6010] branches/1.3/bin/aa.pl

[..hidden..]

Revision: 6010
          http://sourceforge.net/p/ledger-smb/code/6010
Author:   einhverfr
Date:     2013-09-13 06:45:30 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Correcting merge-related error in branches/1.3

Modified Paths:
--------------
    branches/1.3/bin/aa.pl

Modified: branches/1.3/bin/aa.pl
===================================================================
--- branches/1.3/bin/aa.pl	2013-09-13 06:09:38 UTC (rev 6009)
+++ branches/1.3/bin/aa.pl	2013-09-13 06:45:30 UTC (rev 6010)
@@ -974,11 +974,6 @@
               { ndx => 9, key => 'O', value => $hold_text },
             'save_info' => 
               { ndx => 10, key => 'I', value => $locale->text('Save Info') },
-<<<<<<< .working
-=======
-            'save_temp' =>
-              { ndx => 11, key => 'T', value => $locale->text('Save Template')},
->>>>>>> .merge-right.r6006
             'new_screen' => # Create a blank ar/ap invoice.
              { ndx => 12, key=> 'N', value => $locale->text('New') }
         );

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


------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits