ULX fun commands do not work

[Krushak]

I run a TTT gmod server and today when I got on, some how ULX broke and all the fun commands are uncategorized thus leaving us unable to punish RDMers and etc.

I found the error.


[ERROR] addons/ulx/lua/ulx/modules/sh/fun.lua:1: unexpected symbol near '<'
  1. unknown - addons/ulx/lua/ulx/modules/sh/fun.lua:0

What does that mean?

And here is a picture.

Mind you I never changed any of the ULX lua files directly, only through the menu by using !menu

EDIT:

<<<<<<< .mine
local CATEGORY_NAME = "Fun"

------------------------------ Slap ------------------------------
function ulx.slap( calling_ply, target_plys, dmg )
   local affected_plys = {}

   for i=1, #target_plys do
      local v = target_plys[ i ]
      if v:IsFrozen() then
         ULib.tsayError( calling_ply, v:Nick() .. " is frozen!", true )
      else
         ULib.slap( v, dmg )
         table.insert( affected_plys, v )
      end
   end

   ulx.fancyLogAdmin( calling_ply, "#A slapped #T with #i damage", affected_plys, dmg )
end

I assume that's the general area of line 0.

[Megiddo]

It means regardless of what you think happened, your file was modified locally by yourself, someone else, or another program running on your system. It was modified in such a way that it caused a conflict when SVN next tried to update your files.

To fix: Recheckout the files and ensure that local edits do not occur in the ULX files.

[Krushak]

And how do I check that? Mind you the only SVNs I have going is ULX, ULIB and the one for terrortown(Which is badking's TTT). No one has access to the FTP but me.

[Megiddo]

It sounds like it was probably accidental, then. But SVN would not have created a conflict like this unless the file was edited.

[Krushak]

Yeah or something with how nfoservers does it cause they have that web base server thing where it sets up things automatically and I don't mess with gmod.xrap unless I need to, know how or want to toy with it. I found a thread on nfoservers that has that line, line 594 and 1934 or somethibg like that. i could link u later after work. I fixed it by removing whatever line cane up so yeah.