Skip to content
This repository has been archived by the owner on Apr 16, 2024. It is now read-only.

Commit

Permalink
fix: remove git merge junk (2)
Browse files Browse the repository at this point in the history
  • Loading branch information
NTBBloodbath committed Jun 20, 2021
1 parent 9712a64 commit 06854bb
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions lua/doom/utils/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
-- License: MIT --
---[[---------------------------------------]]---

<<<<<<< HEAD
=======
local M = {}

>>>>>>> 007239e94c53ef603d1dcbbe14c43607ff7f6436
-------------------- HELPERS --------------------
-- Doom Nvim version
M.doom_version = '2.3.2'
Expand Down Expand Up @@ -78,15 +75,8 @@ M.try = function(block)
end

-- A better and less primitive implementation of custom plugins in Doom Nvim
<<<<<<< HEAD
function Custom_plugins(plugins)
local packer = require('packer')

packer.use(plugins)
=======
M.custom_plugins = function(plugins)
require('packer').use(plugins)
>>>>>>> 007239e94c53ef603d1dcbbe14c43607ff7f6436
end

-- Get current OS, returns 'Other' if the current OS is not recognized
Expand Down

0 comments on commit 06854bb

Please sign in to comment.