Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@sashadev-sky
sashadev-sky committed Mar 6, 2019
1 parent 80c8ce6 commit c672c96
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 135 deletions.
8 changes: 0 additions & 8 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,9 @@ gem 'mailman', require: false

# To convert html to markdown
gem 'reverse_markdown'
<<<<<<< HEAD
<<<<<<< HEAD

gem 'twitter'

=======
gem 'mysql2', '>= 0.4.4'
>>>>>>> update
=======

>>>>>>> gemfile reverse
# run with `bundle install --without production` or `bundle install --without mysql` to exclude this
group :mysql, :production do
gem 'mysql2', '>= 0.4.4'
Expand Down
9 changes: 0 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,7 @@
"i18n-js": "^3.2.1",
"ics": "nwcell/ics.js#^0.2.0",
"image-sequencer": "^2.2.3",
<<<<<<< HEAD
<<<<<<< HEAD
"inline-markdown-editor": "^0.5.0",
=======
"inline-markdown-editor": "^0.3.4",
"jLouvain": "upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7",
>>>>>>> update
=======
"inline-markdown-editor": "^0.5.0",
>>>>>>> dependency update
"jlouvain": "upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7",
"jquery": "^3.0.0",
"jquery-confirm": "^3.3.4",
Expand Down
137 changes: 19 additions & 118 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,9 @@


"@types/node@^8.0.7":
<<<<<<< HEAD
<<<<<<< HEAD
version "8.10.42"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.42.tgz#d3d8e738e13540a09b3f4a714dac1ffbf8939f7d"
integrity sha512-8LCqostMfYwQs9by1k21/P4KZp9uFQk3Q528y3qtPKQnCJmKz0Em3YzgeNjTNV1FVrG/7n/6j12d4UKg9zSgDw==
=======
version "8.10.40"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.40.tgz#4314888d5cd537945d73e9ce165c04cc550144a4"
integrity sha512-RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ==
>>>>>>> yarn file
=======
version "8.10.42"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.42.tgz#d3d8e738e13540a09b3f4a714dac1ffbf8939f7d"
integrity sha512-8LCqostMfYwQs9by1k21/P4KZp9uFQk3Q528y3qtPKQnCJmKz0Em3YzgeNjTNV1FVrG/7n/6j12d4UKg9zSgDw==
>>>>>>> dependency update

abab@^1.0.0:
version "1.0.4"
Expand Down Expand Up @@ -85,27 +73,6 @@ acorn@^5.0.0:
integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==

acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.4:
<<<<<<< HEAD
<<<<<<< HEAD
version "6.1.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==

ajv@^6.5.5:
version "6.10.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
=======
version "6.1.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.0.tgz#b0a3be31752c97a0f7013c5f4903b71a05db6818"
integrity sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==

ajv@^6.5.5:
version "6.9.1"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
>>>>>>> yarn file
=======
version "6.1.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
Expand All @@ -114,7 +81,6 @@ ajv@^6.5.5:
version "6.10.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
>>>>>>> dependency update
dependencies:
fast-deep-equal "^2.0.1"
fast-json-stable-stringify "^2.0.0"
Expand Down Expand Up @@ -379,12 +345,23 @@ blueimp-canvas-to-blob@>=2.0.5:

blueimp-file-upload@^9.28.0, blueimp-file-upload@blueimp/jQuery-File-Upload#^9.22.1:
version "9.28.0"
uid ee54fc3f57418edc6c86532cfe124a9e2c70deed
resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/ee54fc3f57418edc6c86532cfe124a9e2c70deed"
optionalDependencies:
blueimp-canvas-to-blob "3.5.0"
blueimp-load-image "2.12.2"
blueimp-tmpl "3.6.0"

blueimp-file-upload@blueimp/jQuery-File-Upload#~8.1.0, jquery-file-upload@blueimp/jQuery-File-Upload#~8.1.0:
version "8.1.0"
resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/442027a0fe8d483687596ee72da83c58ce293f1b"
dependencies:
blueimp-canvas-to-blob ">=2.0.5"
blueimp-load-image ">=1.5.0"
blueimp-tmpl ">=2.1.0"
jquery ">=1.6"
jquery.ui.widget ">=1.9"

[email protected]:
version "2.12.2"
resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-2.12.2.tgz#6a17598aab858d4fbf01543e0631141b51057c87"
Expand Down Expand Up @@ -1203,21 +1180,9 @@ es-to-primitive@^1.2.0:
is-symbol "^1.0.2"

es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
<<<<<<< HEAD
<<<<<<< HEAD
version "0.10.48"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.48.tgz#9a0b31eeded39e64453bcedf6f9d50bbbfb43850"
integrity sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw==
=======
version "0.10.47"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.47.tgz#d24232e1380daad5449a817be19bde9729024a11"
integrity sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==
>>>>>>> yarn file
=======
version "0.10.48"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.48.tgz#9a0b31eeded39e64453bcedf6f9d50bbbfb43850"
integrity sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw==
>>>>>>> dependency update
dependencies:
es6-iterator "~2.0.3"
es6-symbol "~3.1.1"
Expand Down Expand Up @@ -2054,12 +2019,11 @@ iconv-lite@~0.2.11:
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8"
integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg=

ics@nwcell/ics.js#^0.2.0:
ics.js@nwcell/ics.js#^0.2.0, ics@nwcell/ics.js#^0.2.0:
version "0.1.3"
resolved "https://codeload.github.com/nwcell/ics.js/tar.gz/4f2e67a79af161af74d986ecc47c3d166a074f11"
dependencies:
bower "~1.2.8"
file-saver "^1.3.3"
grunt "~0.4.2"
grunt-contrib-concat "~0.3.0"
grunt-contrib-jshint "~0.7.2"
Expand Down Expand Up @@ -2260,6 +2224,10 @@ isstream@~0.1.2:
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=

jLouvain@upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7, jlouvain@upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7:
version "0.0.0"
resolved "https://codeload.github.com/upphiminn/jLouvain/tar.gz/3fb3aa189b8232756c4c3f3e97aaf376debf44a7"

[email protected]:
version "0.26.3"
resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
Expand All @@ -2268,10 +2236,6 @@ [email protected]:
commander "0.6.1"
mkdirp "0.3.0"

jlouvain@upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7:
version "0.0.0"
resolved "https://codeload.github.com/upphiminn/jLouvain/tar.gz/3fb3aa189b8232756c4c3f3e97aaf376debf44a7"

[email protected]:
version "0.0.4"
resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.0.4.tgz#06aaf47efec7af0b1924a59cd695a6d2b5ed870e"
Expand All @@ -2294,16 +2258,6 @@ jquery-confirm@^3.3.4:
dependencies:
jquery ">=1.6"

jquery-file-upload@blueimp/jQuery-File-Upload#~8.1.0:
version "8.1.0"
resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/442027a0fe8d483687596ee72da83c58ce293f1b"
dependencies:
blueimp-canvas-to-blob ">=2.0.5"
blueimp-load-image ">=1.5.0"
blueimp-tmpl ">=2.1.0"
jquery ">=1.6"
jquery.ui.widget ">=1.9"

jquery.ui.widget@>=1.9:
version "1.10.3"
resolved "https://registry.yarnpkg.com/jquery.ui.widget/-/jquery.ui.widget-1.10.3.tgz#2ceecfc64995412643eeb9508d2197ea93c02fb3"
Expand All @@ -2320,21 +2274,9 @@ jquery@^2.1.0:
integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=

js-yaml@^3.1.0:
<<<<<<< HEAD
<<<<<<< HEAD
version "3.12.2"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
=======
version "3.12.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
>>>>>>> yarn file
=======
version "3.12.2"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
>>>>>>> dependency update
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
Expand Down Expand Up @@ -3016,15 +2958,7 @@ object-inspect@~1.4.0:
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==

<<<<<<< HEAD
<<<<<<< HEAD
object-keys@^1.0.12, object-keys@^1.0.6:
=======
object-keys@^1.0.6:
>>>>>>> yarn file
=======
object-keys@^1.0.12, object-keys@^1.0.6:
>>>>>>> dependency update
version "1.1.0"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
Expand Down Expand Up @@ -3748,23 +3682,10 @@ sshpk@^1.7.0:
safer-buffer "^2.0.2"
tweetnacl "~0.14.0"

<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dependency update
static-eval@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
<<<<<<< HEAD
=======
static-eval2@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/static-eval2/-/static-eval2-2.0.1.tgz#a241d9c3ad1d08ac8598ca28bc0ef408ec76e4a0"
integrity sha512-WtlMWiobkeCU9tVELHp8+QjTNeAQAqS9/hBHjVKywELbtZqMh3nfSGP8BUVH81/F6rqFLBkjXDJX37t0ym+mqA==
>>>>>>> yarn file
=======
>>>>>>> dependency update
dependencies:
escodegen "^1.8.1"

Expand Down Expand Up @@ -3793,21 +3714,9 @@ static-module@^1.0.0:
through2 "~0.4.1"

static-module@^3.0.0:
<<<<<<< HEAD
<<<<<<< HEAD
version "3.0.2"
resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.2.tgz#4ecdef701260ec1798461022ad4637a7c2c930ef"
integrity sha512-W3aj4MvIMKDoZhVR7XhX7aSlJdw/nf1QAZyJzUUDVkjeBliXNoa0IUUUsAsXm/Wp7+LxDLeZ3idnAZEDg82m2Q==
=======
version "3.0.1"
resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.1.tgz#ae73764637cf2425f82e5393a062cde8aecd45aa"
integrity sha512-NavJkJ9k2vJUl2Hwvm0veRJG5pSYiMtuTC9OsRFFsQcjkksJeBX1VZA5R0csqH2+jkW7qGEne1CvnzvXAvcBTA==
>>>>>>> yarn file
=======
version "3.0.2"
resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.2.tgz#4ecdef701260ec1798461022ad4637a7c2c930ef"
integrity sha512-W3aj4MvIMKDoZhVR7XhX7aSlJdw/nf1QAZyJzUUDVkjeBliXNoa0IUUUsAsXm/Wp7+LxDLeZ3idnAZEDg82m2Q==
>>>>>>> dependency update
dependencies:
acorn-node "^1.3.0"
concat-stream "~1.6.0"
Expand All @@ -3821,15 +3730,7 @@ static-module@^3.0.0:
readable-stream "~2.3.3"
scope-analyzer "^2.0.1"
shallow-copy "~0.0.1"
<<<<<<< HEAD
<<<<<<< HEAD
static-eval "^2.0.1"
=======
static-eval2 "^2.0.1"
>>>>>>> yarn file
=======
static-eval "^2.0.1"
>>>>>>> dependency update
through2 "~2.0.3"

stealthy-require@^1.1.1:
Expand Down Expand Up @@ -4373,9 +4274,9 @@ wrappy@1:
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

ws@^6.1.2:
version "6.2.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==
version "6.1.4"
resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
dependencies:
async-limiter "~1.0.0"

Expand Down

0 comments on commit c672c96

Please sign in to comment.