paoda
/
save-sync
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: fix merge issues

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-03-01 22:57:59 -06:00
parent 864258cc01
commit cb7a72cece
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.drone.yml
View File

@ -6,9 +6,6 @@ steps:
- name: cargo test - name: cargo test
image: rust:latest image: rust:latest
commands: commands:
<<<<<<< HEAD
=======
- export DATABASE_URL=/tmp/save-sync.db - export DATABASE_URL=/tmp/save-sync.db
>>>>>>> dev
- cargo build --all - cargo build --all
- cargo test --all - cargo test --all

9
client/src/archive.rs
View File

@ -73,21 +73,12 @@ impl Archive {
/// ///
/// # Examples /// # Examples
/// ``` /// ```
<<<<<<< HEAD
/// # use crate::client::archive::Archive;
/// let mut archive = Archive::try_default().unwrap();
/// let game_save_path = "/home/user/Documents/generic_company/generic_game/save_folder";
/// match archive.track_game(game_save_path) {
/// Ok(_) => println!("Save Sync is now tracking {}", game_save_path),
/// Err(err) => eprintln!("Failed to track {}: {:?}", game_save_path, err)
=======
/// # use client::archive::Archive; /// # use client::archive::Archive;
/// let mut archive = Archive::try_default().unwrap(); /// let mut archive = Archive::try_default().unwrap();
/// let save_path = "/home/user/Documents/generic_company/generic_game/save_folder"; /// let save_path = "/home/user/Documents/generic_company/generic_game/save_folder";
/// match archive.track_game(save_path) { /// match archive.track_game(save_path) {
/// Ok(_) => println!("Save Sync is now tracking {}", save_path), /// Ok(_) => println!("Save Sync is now tracking {}", save_path),
/// Err(err) => eprintln!("Failed to track {}: {:?}", save_path, err) /// Err(err) => eprintln!("Failed to track {}: {:?}", save_path, err)
>>>>>>> dev
/// }; /// };
/// ``` /// ```
pub fn track_game<P: AsRef<Path>>(&mut self, path: P) -> Result<(), GameTrackError> { pub fn track_game<P: AsRef<Path>>(&mut self, path: P) -> Result<(), GameTrackError> {