diff options
| author | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2016-01-07 21:49:14 -0500 |
|---|---|---|
| committer | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2016-01-07 21:49:14 -0500 |
| commit | 0be6e859473d7a98122c13c5976d0383bd16e19e (patch) | |
| tree | 412f6bd4e4eed43230cb8b3d7183adaaf80b09cb /gamemode/itemsystem | |
| parent | 00104b2da86051a47c0ea8aa7a907a31c1c83577 (diff) | |
| download | wintersurvival2-0be6e859473d7a98122c13c5976d0383bd16e19e.tar.gz wintersurvival2-0be6e859473d7a98122c13c5976d0383bd16e19e.tar.bz2 wintersurvival2-0be6e859473d7a98122c13c5976d0383bd16e19e.zip | |
Fixed conflict in researchtable
Diffstat (limited to 'gamemode/itemsystem')
| -rw-r--r-- | gamemode/itemsystem/items/researchtable.lua | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/gamemode/itemsystem/items/researchtable.lua b/gamemode/itemsystem/items/researchtable.lua index 57a209c..25c8201 100644 --- a/gamemode/itemsystem/items/researchtable.lua +++ b/gamemode/itemsystem/items/researchtable.lua @@ -1,10 +1,6 @@ ITEM.Name = "Research Table"
ITEM.Class = "structure"
-<<<<<<< HEAD -ITEM.Desc = "A table that gives hints every 30 seconds to nearby players"
-======= ITEM.Desc = "A table to find recepies\nHold down shift to snap"
->>>>>>> building-rotateable ITEM.Model = "models/props_junk/wood_crate001a.mdl"
ITEM.Icon = Material("wintersurvival2/hud/ws2_icons/icon_recipe.png")
ITEM.Recipe = {
|