--- deliantra/Deliantra-Client/DC/UI.pm	2007/08/22 21:40:43	1.435
+++ deliantra/Deliantra-Client/DC/UI.pm	2007/08/22 21:40:57	1.436
@@ -2898,15 +2898,9 @@
 sub set_value {
    my ($self, $lvl, $exp) = @_;
 
-<<<<<<< UI.pm
    $self->{lvl} = $lvl;
    $self->{exp} = $exp;
 
-=======
-   $self->{lvl} = $exp;
-   $self->{exp} = $exp;
-
->>>>>>> 1.434
    my $v = -1;
 
    if ($::CONN && (my $table = $::CONN->{exp_table})) {