Skip to content

Commit

Permalink
Merge pull request #23 from kefniark/feature/upgrade
Browse files Browse the repository at this point in the history
Dependency Update
  • Loading branch information
kefniark committed Feb 22, 2018
2 parents 1a2222c + 9a85e22 commit 9cfa844
Show file tree
Hide file tree
Showing 13 changed files with 792 additions and 452 deletions.
24 changes: 24 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# EditorConfig is awesome: http://EditorConfig.org
# Download a plugin for your favorite editor from http://editorconfig.org/#download

root = true

[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true

[*.cs]
insert_final_newline = true
end_of_line = lf
charset = utf-8
indent_style = tab

[*.{yaml,yml}]
insert_final_newline = true
indent_style = space
indent_size = 4

[*.json]
insert_final_newline = false
indent_style = tab
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
/.vs/
/UnityPackageManager/

# Autogenerated VS/MD solution and project files
ExportedObj/
Expand Down
2 changes: 1 addition & 1 deletion Assets/Editor/ParserTest.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using UnityEngine;
using UnityEngine;
using NUnit.Framework;
using BarcodeScanner;
using BarcodeScanner.Parser;
Expand Down
Loading

0 comments on commit 9cfa844

Please sign in to comment.