From f33a047460d1f9bf50f477085cd13ade0b7b6205 Mon Sep 17 00:00:00 2001
From: Paulo Henrique <phcp@cin.ufpe.br>
Date: Thu, 20 Nov 2014 01:16:49 -0300
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=B5es=20de=20conflitos=20jsp=20no?=
 =?UTF-8?q?=20merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/web.xml                        |  2 +-
 WebContent/jsp/conf/courseMenu.jsp                |  5 +----
 WebContent/jsp/conf/header.jsp                    | 13 -------------
 WebContent/jsp/course/viewGraphic.jsp             |  3 ---
 .../messages/MessageResources_en_US.properties    | 11 ++---------
 .../messages/MessageResources_pt_BR.properties    | 15 ++++-----------
 6 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index ba76edc..3b137f2 100755
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -53,7 +53,7 @@
    						 /WEB-INF/struts/struts-config-settings.xml,
    						 /WEB-INF/struts/struts-config-log.xml,
    						 /WEB-INF/struts/struts-config-messenger.xml,
-   						 /WEB-INF/struts/struts-config-twittertool.xml
+   						 /WEB-INF/struts/struts-config-twittertool.xml,
    						 /WEB-INF/struts/struts-config-log.xml</param-value>
 		</init-param>
 		<load-on-startup>2</load-on-startup>
diff --git a/WebContent/jsp/conf/courseMenu.jsp b/WebContent/jsp/conf/courseMenu.jsp
index 6f896f3..6b70b35 100755
--- a/WebContent/jsp/conf/courseMenu.jsp
+++ b/WebContent/jsp/conf/courseMenu.jsp
@@ -33,15 +33,12 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 			<c:if test="${selectedPosition == 4}"><li><b>Avaliações do Curso</b></li></c:if>
 			<c:if test="${selectedPosition != 4}"><li><html:link action="course.do?method=showViewCourseEvaluations&courseId=${course.id}">Avaliações do Curso</html:link></li></c:if>
 		</c:if>
-<<<<<<< HEAD
-=======
-		
+
 		<c:if test="${canViewGroups}">
 			<c:if test="${selectedPosition == 6}"><li><b>Grupos</b></li></c:if>
 			<c:if test="${selectedPosition != 6}"><li><html:link action="course.do?method=showViewGroups&courseId=${course.id}">Grupos</html:link></li></c:if>
 		</c:if>
 
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		<c:if test="${canViewGraphic}">
 			<c:if test="${selectedPosition == 5}"><li><b>Módulo de Visualização</b></li></c:if>
 			<c:if test="${selectedPosition != 5}"><li><html:link action="course.do?method=showViewGraphic&courseId=${course.id}&graphic=sel&moduleSel=-1&idAluno=-1&idGame=-1">Módulo de Visualização</html:link></li></c:if>
diff --git a/WebContent/jsp/conf/header.jsp b/WebContent/jsp/conf/header.jsp
index f4aaf23..c9cfeae 100755
--- a/WebContent/jsp/conf/header.jsp
+++ b/WebContent/jsp/conf/header.jsp
@@ -20,16 +20,12 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 	
 	<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
 	<link href="themes/default/css/amadeus.css" rel="stylesheet" type="text/css" />
-<<<<<<< HEAD
 	<link href="themes/default/css/messenger.css" rel="stylesheet" type="text/css" />
 	<link href="themes/default/css/twittertool.css" rel="stylesheet" type="text/css" />
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 	<link href="themes/default/css/content_management.css" rel="stylesheet" type="text/css" />
 	<link href="themes/default/css/jqueryui/smoothness/jquery-ui-1.7.1.custom.css" rel="stylesheet" type="text/css" />
 	<link href="themes/default/imgs/favicon.ico" rel="shortcut icon" />
 	
-<<<<<<< HEAD
 	<!-- <link href="themes/default/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>
 	<link href="themes/default/css/bootstrap.min.css" rel="stylesheet" type="text/css"/> -->
 	<link href="themes/default/css/nyroModal.css" rel="stylesheet" type="text/css"/>
@@ -52,15 +48,6 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
 	<script type="text/javascript" src="js/amadeus.js"></script>
 	<script type="text/javascript" src="js/messenger.js"></script>
 	<script type="text/javascript" src="js/twittertool.js"></script>
-=======
-	<script type='text/javascript' src='dwr/interface/UtilDWR.js'></script>
-	<script type='text/javascript' src='dwr/engine.js'></script>
-	<script type='text/javascript' src='dwr/util.js'></script>
-	<script type="text/javascript" src="js/jqueryui/jquery-1.3.2.min.js"></script>
-	<script type="text/javascript" src="js/jqueryui/jquery-ui-1.7.1.custom.min.js"></script>
-	<script type="text/javascript" src="js/openid.js"></script>
-	<script type="text/javascript" src="js/amadeus.js"></script>
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 	<script type="text/javascript">		
 	
 	
diff --git a/WebContent/jsp/course/viewGraphic.jsp b/WebContent/jsp/course/viewGraphic.jsp
index 0508b4e..55e790b 100755
--- a/WebContent/jsp/course/viewGraphic.jsp
+++ b/WebContent/jsp/course/viewGraphic.jsp
@@ -100,14 +100,11 @@ function selectGame()
 		<div id="pLeftMenu" class="pLeftMenu">
 			<c:set var="selectedPosition" value="5" scope="request" />
 			<jsp:include page="/jsp/conf/courseMenu.jsp" />
-<<<<<<< HEAD
 			
 			<!-- Added By Nailson Cunha -->
 			<div id="twitter-container">
 				<jsp:include page="/jsp/twittertool/userTwitter.jsp" />
 			</div>
-=======
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 		</div>
 		<div id="pContent" class="pContent2">
 
diff --git a/src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_en_US.properties b/src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_en_US.properties
index 1800452..aa7937f 100755
--- a/src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_en_US.properties
+++ b/src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_en_US.properties
@@ -766,22 +766,16 @@ course.showViewCourse=showViewCourse
 course.showViewCourseNotLogged=showViewCourseNotLogged
 course.showViewCourseParticipants=showViewCourseParticipants
 course.showViewEditCourse=showViewEditCourse
-<<<<<<< HEAD
 course.showViewSocialInteractionMonitoring=showViewSocialInteractionMonitoring
 course.showViewSocialInteractionMonitoringReports=showViewSocialInteractionMonitoringReports
-=======
 course.showViewCreateGroup=showViewCreateGroup
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 course.showViewShowModules=showViewShowModules
 course.showViewCourseEvaluations=showViewCourseEvaluations
 course.showViewSendMail=showViewSendMail
 course.sendMailForCourseParticipants=sendMailForCourseParticipants
 course.changeTeacher=changeTeacher
-course.viewChangeTeacher=viewChangeTeacher
+course.viewChangeTeacher=viewChangeTeacher
 course.showViewGraphic=showViewGraphic
-<<<<<<< HEAD
-course.showPlayGame=showPlayGame
-=======
 course.showViewGroupDayTimeline=showViewGroupDayTimeline
 course.showViewPersonDayTimeline=showViewPersonDayTimeline
 course.showViewGroups=showViewGroups
@@ -791,7 +785,6 @@ course.showViewGroupTimeline=showViewGroupTimeline
 course.showViewPersonTimeline=showViewPersonTimeline
 course.showPlayGame=showPlayGame
 course.showViewGroupsRelatorio=showViewRelatorioAtividade
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 #-- MAP Action method module --
 module.showViewEditModule=showViewEditModule
@@ -886,7 +879,7 @@ managerUsers.profileType=*Profile type:
 managerUsers.profileType.type=Type
 managerUsers.profileType.admin=Administrator
 managerUsers.profileType.student=Student
-managerUsers.profileType.professor=Teacher
+managerUsers.profileType.professor=Teacher
 
 #-- Log --
 log.saveLog=saveLog
diff --git a/src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_pt_BR.properties b/src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_pt_BR.properties
index 2e2a09d..d23e204 100755
--- a/src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_pt_BR.properties
+++ b/src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_pt_BR.properties
@@ -760,32 +760,25 @@ course.showViewCourseNotLogged=showViewCourseNotLogged
 course.showViewCourseParticipants=showViewCourseParticipants
 course.unregisterStudentCourse=unregisterStudentCourse
 course.showViewEditCourse=showViewEditCourse
-<<<<<<< HEAD
 course.showViewSocialInteractionMonitoring=showViewSocialInteractionMonitoring
 course.showViewSocialInteractionMonitoringReports=showViewSocialInteractionMonitoringReports
-=======
 course.showViewCreateGroup=showViewCreateGroup
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 course.showViewShowModules=showViewShowModules
 course.showViewCourseEvaluations=showViewCourseEvaluations
 course.showViewSendMail=showViewSendMail
 course.sendMailForCourseParticipants=sendMailForCourseParticipants
 course.changeTeacher=changeTeacher
-course.viewChangeTeacher=viewChangeTeacher
-course.sendMailForCourseParticipants=sendMailForCourseParticipants
-<<<<<<< HEAD
-course.showViewGraphic=showViewGraphic
-=======
+course.viewChangeTeacher=viewChangeTeacher
+course.sendMailForCourseParticipants=sendMailForCourseParticipants
 course.showViewGraphic=showViewGraphic
 course.showViewGroupDayTimeline=showViewGroupDayTimeline
 course.showViewPersonDayTimeline=showViewPersonDayTimeline
 course.showViewGroups=showViewGroups
 course.habilitarDesabilitarCriarGrupos=habilitarDesabilitarCriarGrupos
 course.showViewGroupTimeline=showViewGroupTimeline
-course.showViewPersonTimeline=showViewPersonTimeline
+course.showViewPersonTimeline=showViewPersonTimeline
 course.showViewOneGroup=showViewOneGroup
 course.showViewGroupsRelatorio=showViewRelatorioAtividade
->>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
 
 #-- MAP Action method module --
 module.showViewEditModule=showViewEditModule
@@ -885,7 +878,7 @@ managerUsers.profileType=*Tipo de Perfil:
 managerUsers.profileType.type=Tipo
 managerUsers.profileType.admin=Administrador
 managerUsers.profileType.student=Aluno
-managerUsers.profileType.professor=Professor
+managerUsers.profileType.professor=Professor
 
 #-- Log --
 log.saveLog=saveLog