Skip to content

Codecrew / Moya

Go to a project
Commit 98c8bf4e by Riku Silvola
Options

color me closed 3

1 parent 9059afb5
Inline Side-by-side
Showing with 0 additions and 4 deletions
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
...@@ -73,13 +73,9 @@ ...@@ -73,13 +73,9 @@
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</p:column> </p:column>
<<<<<<< HEAD
=======
<p:column> <p:column>
<p:rowEditor /> <p:rowEditor />
</p:column> </p:column>
>>>>>>> 5c881099ad3e46541138670b63f9506684ecd1e2
<!-- <!--
<p:column> <p:column>
<h:outputText value="#{foodwave.closed.toString()}" /> <h:outputText value="#{foodwave.closed.toString()}" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!