commit 47a06b902fe4981c6fce136fe967885f8898d971
Merge: 6a72177 f150e03
Author: Glen Rundblom <grundblom(a)fedoraproject.org>
Date: Sun Nov 1 18:20:51 2015 -0600
Merged f23 to master
en-US/Article_Info.xml | 2 +-
en-US/Feedback.xml | 5 +++++
en-US/Release_Notes.ent | 2 +-
en-US/Revision_History.xml | 19 ++++++++++++++++++-
en-US/Section-Desktop.xml | 3 ---
en-US/Security.xml | 2 +-
zanata.xml | 2 +-
7 files changed, 27 insertions(+), 8 deletions(-)
---
diff --cc en-US/Feedback.xml
index 98bc736,b6b0615..2fa5e2a
--- a/en-US/Feedback.xml
+++ b/en-US/Feedback.xml
@@@ -24,8 -24,8 +24,13 @@@
Bugs And Feature Requests</ulink>.
A list of commonly reported bugs and known issues for this
release is available from <ulink
++<<<<<<< HEAD
+
url="http://fedoraproject.org/wiki/Common_F23_bugs">
+ Common F&PRODVER; bugs</ulink>, on the wiki.
++=======
+ url="&FBUGURL;">
+ Common bugs</ulink>, on the wiki.
++>>>>>>> f23
</para>
<para>
To provide feedback on the Release Notes, use &BZURL;.