Code

Resolving conflicts#1

Code

Open

raghusodani wants to merge 34 commits intoraghusodani:masterraghusodani/algos-web:masterfrom iiitv:masteriiitv/algos-web:masterCopy head branch name to clipboard

+2,314-16,355

Commits

Commits on Oct 9, 2021

• preloader added

  marizvi

  committed
  e1a4133

Commits on Oct 12, 2021

• preloader added

  marizvi

  committed
  327fecc

Commits on Oct 13, 2021

• Merge pull request #56 from marizvi/master

  Show description for 958cdfc
  shivamm0110

  authored
  958cdfc

Commits on Oct 14, 2021

• feat:axios added

  prathmeshkhandelwal1

  committed
  66521c2

Commits on Oct 11, 2022

• improved css of list in homepage

  ShravaniAK

  committed
  88395cc

Commits on Oct 20, 2022

• Merge pull request #69 from ShravaniAK/master

  Show description for 7b51b1b
  rashiyadhruv

  authored
  7b51b1b

Commits on Oct 2, 2023

• Update package.json

  AniModi

  authored
  7003854

• updated package.json

  AniModi

  committed
  e8f1c0c

• Merge pull request #79 from AniModi/master

  Show description for f42ed5b
  AniModi

  authored
  f42ed5b

• Page in between the github transition

  SteakFisher

  committed
  48f356a

Commits on Oct 3, 2023

• Delete package-lock.json

  Show description for aff5347
  SteakFisher

  authored
  aff5347

• Setting up vercel

  aryanargupta

  committed
  1bd52bc

• Create vercel.yml

  aryanargupta

  authored
  1457113

• Update vercel.yml

  aryanargupta

  authored
  946a97c

• Update vercel.yml

  aryanargupta

  authored
  2c56dff

• updated vercel.yml

  aryanargupta

  authored
  4b04840

• Update vercel.yml

  aryanargupta

  authored
  8af045f

• Update vercel.yml

  aryanargupta

  authored
  2550179

• vercel.yml workflow

  aryanargupta

  authored
  7226912

• Update vercel.yml

  aryanargupta

  authored
  4218b84

• Update vercel.yml

  aryanargupta

  authored
  218a8f5

• Update vercel.yml

  AniModi

  authored
  eae491b

• Delete .github/workflows/vercel.yml

  aryanargupta

  authored
  8c56d31

• Merge pull request #81 from SteakFisher/master

  Show description for 6452c59
  AniModi

  authored
  6452c59

• Revert "Feat: Page in between the github transition "

  AniModi

  authored
  f883969

• Merge pull request #84 from iiitv/revert-81-master

  Show description for ee8ef89
  AniModi

  authored
  ee8ef89

• Adding netlify.toml

  AniModi

  authored
  dd13ba8

• Re: Page in between redirection

  Show description for 874e3e1
  SteakFisher

  committed
  874e3e1

• Merge branch 'iiitv:master' into master

  SteakFisher

  authored
  28e44e1

• Update Algorithm.js

  SteakFisher

  authored
  9aa5901

Commits on Oct 4, 2023

• Merge pull request #86 from SteakFisher/master

  Show description for 8227432
  AniModi

  authored
  8227432

• feat: add github workflow

  Alitindrawan24

  committed
  8e5d189

• feat: add github workflow

  Alitindrawan24

  committed
  b0cd9e0

Commits on Oct 7, 2023

• Merge pull request #90 from Alitindrawan24/master

  Show description for 9e63a96
  aryanargupta

  authored
  9e63a96