Skip to content

Commit

Permalink
Merge branch 'beta' into early
Browse files Browse the repository at this point in the history
  • Loading branch information
dragoonDorise committed Apr 21, 2023
2 parents 17d4bc8 + 6a08ba2 commit e39c202
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion release/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "EmuDeck",
"version": "2.0.35",
"version": "2.0.36",
"description": "Play all your RetroGames",
"license": "MIT",
"author": {
Expand Down
6 changes: 4 additions & 2 deletions src/renderer/pages/CheckUpdatePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import Wrapper from 'components/molecules/Wrapper/Wrapper';
import Header from 'components/organisms/Header/Header';
import Footer from 'components/organisms/Footer/Footer';
import { useNavigate } from 'react-router-dom';
//Ask for branch
const branch = require('data/branch.json');
import Main from 'components/organisms/Main/Main';
import { Alert } from 'getbasecore/Molecules';

//Ask for branch
const branchFile = require('data/branch.json');
const branch = branchFile.branch;

import {
BtnSimple,
ProgressBar,
Expand Down

0 comments on commit e39c202

Please sign in to comment.