Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/EjercitarJPA
diff options
context:
space:
mode:
authorSamu <samurey@gmail.com>2013-10-12 11:29:47 (GMT)
committer Samu <samurey@gmail.com>2013-10-12 11:29:47 (GMT)
commit5575abd19b82ef433955fceeb743606075420cf9 (patch)
tree006ea0e1f03058c126e726748aff2384c67e4bfd /EjercitarJPA
parentd86002e47af2ecfd6a39d74fe23e94d92b0cae31 (diff)
parent8c1df67c566a7d4fe6e2a045ffe42080da3f563d (diff)
Merge remote-tracking branch 'remotes/origin/Cecilia' into samu
Diffstat (limited to 'EjercitarJPA')
-rw-r--r--EjercitarJPA/src/model/Concepto.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index 41b4d86..877b02d 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -54,7 +54,6 @@ public class Concepto implements Serializable {
@Column(name = "nombre")
private String nombre;
@Basic(optional = false)
- @NotNull
@Size(min = 1, max = 2147483647)
@Column(name = "descripcion")
private String descripcion;