www/server/gnun gnun.mk

[Hossam Hossny]

CVSROOT:        /web/www
Module name:    www
Changes by:     Hossam Hossny <mbf>     08/07/18 10:57:11

Modified files:
        server/gnun    : gnun.mk 

Log message:
        Corrected a CVS unknown behaviour issue that caused errors in the file

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/gnun.mk?cvsroot=www&r1=1.37&r2=1.38

Patches:
Index: gnun.mk
===================================================================
RCS file: /web/www/www/server/gnun/gnun.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gnun.mk     18 Jul 2008 10:52:13 -0000      1.37
+++ gnun.mk     18 Jul 2008 10:57:06 -0000      1.38
@@ -17,19 +17,11 @@
 
 # TRANSLATORS: Add here your language code.  Please keep the
 # alphabetical order.
-<<<<<<< gnun.mk
-TEMPLATE_LINGUAS := af ar bg ca es it pt pt-br ru tr zh-cn
-=======
-TEMPLATE_LINGUAS := af bg ca es it pt pt-br ru sr tr zh-cn
->>>>>>> 1.36
+TEMPLATE_LINGUAS := af ar bg ca es it pt pt-br ru sr tr zh-cn
 
 # TRANSLATORS: If you have committed home.LANG.po, add here your
 # language code.
-<<<<<<< gnun.mk
 HOME_LINGUAS := ar bg ca es ru zh-cn
-=======
-HOME_LINGUAS := bg ca es ru sr zh-cn
->>>>>>> 1.36
 
 ### The variables below are edited by GNUN maintainers. ###