D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 13 Projects 2 Releases 2 Wiki Activity

Resolve conflict

This commit is contained in:
Serafeim Chatzopoulos 2023-07-18 18:38:26 +03:00
parent 0c433eccdd
commit db4ca43ee8
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml
View File

@ -340,19 +340,12 @@
</action>
<<<<<<< HEAD
<!-- Removed for ser -->
<!--
JOIN ITERATIVE METHODS AND THEN END =
<join name="join-iterative-rankings" to="end" />
to="get-file-names"/>
-->
=======
<!-- JOIN ITERATIVE METHODS AND THEN END -->
<join name="join-iterative-rankings" to="get-file-names" />
<!-- to="get-file-names"/> -->
>>>>>>> 60f25b780de1c456762003cbb8b0011c9c82f93d
<!-- This will be a shell action that will output key-value pairs for output files -->
<action name="get-file-names">