[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy fs-translations.html
|
From: |
Therese Godefroy |
|
Subject: |
www/philosophy fs-translations.html |
|
Date: |
Thu, 2 Feb 2017 11:26:31 -0500 (EST) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 17/02/02 11:26:31
Modified files:
philosophy : fs-translations.html
Log message:
Fix conflict.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.html?cvsroot=www&r1=1.149&r2=1.150
Patches:
Index: fs-translations.html
===================================================================
RCS file: /webcvs/www/www/philosophy/fs-translations.html,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- fs-translations.html 2 Feb 2017 15:36:57 -0000 1.149
+++ fs-translations.html 2 Feb 2017 16:26:31 -0000 1.150
@@ -944,11 +944,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-<<<<<<< fs-translations.html
-$Date: 2017/02/02 15:36:57 $
-=======
-$Date: 2017/02/02 15:36:57 $
->>>>>>> 1.148
+$Date: 2017/02/02 16:26:31 $
<!-- timestamp end -->
</p>
</div>